fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lots of compile fixes

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-04 03:02:48 +02:00
parent 6eb2a9504a
commit 237463dd94
241 changed files with 3438 additions and 3474 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/AppEng.java
+12 -6
View File
@@ -51,6 +51,8 @@ import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import javax.annotation.Nonnull;
@Mod(AppEng.MOD_ID)
public final class AppEng
@@ -83,6 +85,7 @@ public final class AppEng
if (INSTANCE != null) {
throw new IllegalStateException();
}
INSTANCE = this;
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AEConfig.CLIENT_SPEC);
@@ -126,12 +129,15 @@ public final class AppEng
ModelLoaderRegistry.registerLoader(new ResourceLocation(AppEng.MOD_ID, "sky_compass"), SkyCompassModelLoader.INSTANCE);
}
// @Nonnull
// public static AppEng instance()
// {
// return INSTANCE;
// }
//
@Nonnull
public static AppEng instance()
{
if (INSTANCE == null) {
throw new IllegalStateException();
}
return INSTANCE;
}
// public Biome getStorageBiome()
// {
// return this.registration.storageBiome;
src/main/java/appeng/core/FacadeConfig.java
+68 -76
View File
@@ -19,20 +19,12 @@
package appeng.core;
import java.io.File;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import net.minecraft.block.Block;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.config.ConfigCategory;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.common.config.Property;
import net.minecraftforge.common.config.Property.Type;
import it.unimi.dsi.fastutil.objects.Object2IntArrayMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.minecraft.block.Block;
import net.minecraft.util.ResourceLocation;
import java.io.File;
public class FacadeConfig
@@ -72,73 +64,73 @@ public class FacadeConfig
*/
public static void init( final File configFile )
{
final Configuration configurartion = migrate( new Configuration( configFile, CONFIG_VERSION ) );
// FIXME final Configuration configurartion = migrate( new Configuration( configFile, CONFIG_VERSION ) );
// FIXME
// FIXME final boolean allowTileEntityFacades = configurartion
// FIXME .get( CONFIG_COMMON_KEY, CONFIG_COMMON_ALLOW_TILEENTITIES_KEY, false, CONFIG_COMMON_ALLOW_TILEENTITIES_COMMENT )
// FIXME .setRequiresMcRestart( true )
// FIXME .setShowInGui( false )
// FIXME .getBoolean();
// FIXME
// FIXME final Object2IntMap<ResourceLocation> configWhiteList = new Object2IntArrayMap<>();
// FIXME
// FIXME final Set<ConfigCategory> whitelist = configurartion.getCategory( CONFIG_FACADES_KEY ).getChildren();
// FIXME for( ConfigCategory configCategory : whitelist )
// FIXME {
// FIXME final String domain = configCategory.getName();
// FIXME final Map<String, Property> values = configCategory.getValues();
// FIXME
// FIXME for( Entry<String, Property> entry : values.entrySet() )
// FIXME {
// FIXME configWhiteList.put( new ResourceLocation( domain, entry.getKey() ), entry.getValue().getInt() );
// FIXME }
// FIXME }
// FIXME
// FIXME if( configurartion.hasChanged() )
// FIXME {
// FIXME configurartion.save();
// FIXME }
final boolean allowTileEntityFacades = configurartion
.get( CONFIG_COMMON_KEY, CONFIG_COMMON_ALLOW_TILEENTITIES_KEY, false, CONFIG_COMMON_ALLOW_TILEENTITIES_COMMENT )
.setRequiresMcRestart( true )
.setShowInGui( false )
.getBoolean();
final Object2IntMap<ResourceLocation> configWhiteList = new Object2IntArrayMap<>();
final Set<ConfigCategory> whitelist = configurartion.getCategory( CONFIG_FACADES_KEY ).getChildren();
for( ConfigCategory configCategory : whitelist )
{
final String domain = configCategory.getName();
final Map<String, Property> values = configCategory.getValues();
for( Entry<String, Property> entry : values.entrySet() )
{
configWhiteList.put( new ResourceLocation( domain, entry.getKey() ), entry.getValue().getInt() );
}
}
if( configurartion.hasChanged() )
{
configurartion.save();
}
instance = new FacadeConfig( allowTileEntityFacades, configWhiteList );
instance = new FacadeConfig( false, new Object2IntArrayMap<>() ); // FIXME
}
private static Configuration migrate( Configuration configurartion )
{
// Clear pre rv6 configs.
if( configurartion.getLoadedConfigVersion() == null )
{
for( String category : configurartion.getCategoryNames() )
{
final ConfigCategory c = configurartion.getCategory( category );
configurartion.removeCategory( c );
}
}
// Create general category, if missing
if( !configurartion.hasCategory( CONFIG_COMMON_KEY ) )
{
configurartion.getCategory( CONFIG_COMMON_KEY ).setComment( CONFIG_COMMON_COMMENT );
}
// Create whitelist, if missing
if( !configurartion.hasCategory( CONFIG_FACADES_KEY ) )
{
final ConfigCategory category = configurartion.getCategory( CONFIG_FACADES_KEY );
category.setComment( CONFIG_FACADES_COMMENT );
// Whitelist some vanilla blocks like glass
final ConfigCategory minecraft = new ConfigCategory( "minecraft", category );
minecraft.put( "glass", new Property( "glass", "16", Type.INTEGER ) );
minecraft.put( "stained_glass", new Property( "stained_glass", "16", Type.INTEGER ) );
// Whitelist some AE2 blocks like quartz glass
final ConfigCategory appliedenergistics = new ConfigCategory( "appliedenergistics2", category );
appliedenergistics.put( "quartz_glass", new Property( "quartz_glass", "16", Type.INTEGER ) );
appliedenergistics.put( "quartz_vibrant_glass", new Property( "quartz_vibrant_glass", "16", Type.INTEGER ) );
}
return configurartion;
}
// FIXME private static Configuration migrate( Configuration configurartion )
// FIXME {
// FIXME // Clear pre rv6 configs.
// FIXME if( configurartion.getLoadedConfigVersion() == null )
// FIXME {
// FIXME for( String category : configurartion.getCategoryNames() )
// FIXME {
// FIXME final ConfigCategory c = configurartion.getCategory( category );
// FIXME configurartion.removeCategory( c );
// FIXME }
// FIXME }
// FIXME
// FIXME // Create general category, if missing
// FIXME if( !configurartion.hasCategory( CONFIG_COMMON_KEY ) )
// FIXME {
// FIXME configurartion.getCategory( CONFIG_COMMON_KEY ).setComment( CONFIG_COMMON_COMMENT );
// FIXME }
// FIXME
// FIXME // Create whitelist, if missing
// FIXME if( !configurartion.hasCategory( CONFIG_FACADES_KEY ) )
// FIXME {
// FIXME final ConfigCategory category = configurartion.getCategory( CONFIG_FACADES_KEY );
// FIXME category.setComment( CONFIG_FACADES_COMMENT );
// FIXME
// FIXME // Whitelist some vanilla blocks like glass
// FIXME final ConfigCategory minecraft = new ConfigCategory( "minecraft", category );
// FIXME minecraft.put( "glass", new Property( "glass", "16", Type.INTEGER ) );
// FIXME minecraft.put( "stained_glass", new Property( "stained_glass", "16", Type.INTEGER ) );
// FIXME
// FIXME // Whitelist some AE2 blocks like quartz glass
// FIXME final ConfigCategory appliedenergistics = new ConfigCategory( "appliedenergistics2", category );
// FIXME appliedenergistics.put( "quartz_glass", new Property( "quartz_glass", "16", Type.INTEGER ) );
// FIXME appliedenergistics.put( "quartz_vibrant_glass", new Property( "quartz_vibrant_glass", "16", Type.INTEGER ) );
// FIXME }
// FIXME
// FIXME return configurartion;
// FIXME }
public static FacadeConfig instance()
{
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+85 -56
View File
@@ -22,23 +22,28 @@ package appeng.core.api.definitions;
import appeng.api.definitions.IBlockDefinition;
import appeng.api.definitions.IBlocks;
import appeng.api.definitions.ITileDefinition;
import appeng.block.crafting.*;
import appeng.block.grindstone.BlockCrank;
import appeng.block.grindstone.BlockGrinder;
import appeng.block.misc.BlockQuartzFixture;
import appeng.block.misc.BlockSkyCompass;
import appeng.block.misc.SkyCompassRendering;
import appeng.block.misc.*;
import appeng.block.spatial.BlockMatrixFrame;
import appeng.block.storage.BlockSkyChest;
import appeng.bootstrap.*;
import appeng.bootstrap.definitions.TileEntityDefinition;
import appeng.client.render.crafting.CraftingCubeRendering;
import appeng.client.render.tesr.CrankTESR;
import appeng.client.render.tesr.SkyChestTESR;
import appeng.api.features.AEFeature;
import appeng.core.features.registries.PartModels;
import appeng.decorative.AEDecorativeBlock;
import appeng.decorative.solid.*;
import appeng.tile.crafting.TileCraftingMonitorTile;
import appeng.tile.crafting.TileCraftingStorageTile;
import appeng.tile.crafting.TileCraftingTile;
import appeng.tile.crafting.TileMolecularAssembler;
import appeng.tile.grindstone.TileCrank;
import appeng.tile.grindstone.TileGrinder;
import appeng.tile.misc.TileInscriber;
import appeng.tile.misc.TileSkyCompass;
import appeng.tile.storage.TileSkyChest;
import net.minecraft.block.Block;
@@ -50,7 +55,7 @@ import net.minecraft.client.renderer.RenderType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ToolType;
import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType;
import static appeng.decorative.solid.BlockSkyStone.SkystoneType;
@@ -254,11 +259,12 @@ public final class ApiBlocks implements IBlocks
})
.build() )
.build();
// this.inscriber = registry.block( "inscriber", BlockInscriber::new )
// .features( AEFeature.INSCRIBER )
// .tileEntity( registry.tileEntity("", TileInscriber.class, TileInscriber::new).build() )
// .rendering( new InscriberRendering() )
// .build();
this.inscriber = registry.block( "inscriber", () -> new BlockInscriber(Block.Properties.create(Material.IRON)) )
.features( AEFeature.INSCRIBER )
.tileEntity( registry.tileEntity("inscriber", TileInscriber.class, TileInscriber::new)
.rendering(new InscriberRendering())
.build() )
.build();
// this.wirelessAccessPoint = registry.block( "wireless_access_point", BlockWireless::new )
// .features( AEFeature.WIRELESS_ACCESS_TERMINAL )
// .tileEntity( registry.tileEntity("", TileWireless.class, TileWireless::new).build() )
@@ -299,12 +305,12 @@ public final class ApiBlocks implements IBlocks
// .build();
// this.quantumRing = registry.block( "quantum_ring", BlockQuantumRing::new )
// .features( AEFeature.QUANTUM_NETWORK_BRIDGE )
// .tileEntity( new TileEntityDefinition( TileQuantumBridge.class, "quantum_ring" ) )
// .tileEntity( registry.tileEntity( TileQuantumBridge.class, "quantum_ring" ) )
// .rendering( new QuantumBridgeRendering() )
// .build();
// this.quantumLink = registry.block( "quantum_link", BlockQuantumLinkChamber::new )
// .features( AEFeature.QUANTUM_NETWORK_BRIDGE )
// .tileEntity( new TileEntityDefinition( TileQuantumBridge.class, "quantum_ring" ) )
// .tileEntity( registry.tileEntity( TileQuantumBridge.class, "quantum_ring" ) )
// .rendering( new QuantumBridgeRendering() )
// .build();
// this.spatialPylon = registry.block( "spatial_pylon", BlockSpatialPylon::new )
@@ -384,51 +390,74 @@ public final class ApiBlocks implements IBlocks
// .tileEntity( registry.tileEntity("", TileCreativeEnergyCell.class, TileCreativeEnergyCell::new).build() )
// .build();
//
// FeatureFactory crafting = registry.features( AEFeature.CRAFTING_CPU );
// this.craftingUnit = crafting.block( "crafting_unit", () -> new BlockCraftingUnit( CraftingUnitType.UNIT ) )
// .rendering( new CraftingCubeRendering( "crafting_unit", CraftingUnitType.UNIT ) )
// .tileEntity( new TileEntityDefinition( TileCraftingTile.class, "crafting_unit" ) )
// .useCustomItemModel()
// .build();
// this.craftingAccelerator = crafting.block( "crafting_accelerator", () -> new BlockCraftingUnit( CraftingUnitType.ACCELERATOR ) )
// .rendering( new CraftingCubeRendering( "crafting_accelerator", CraftingUnitType.ACCELERATOR ) )
// .tileEntity( new TileEntityDefinition( TileCraftingTile.class, "crafting_unit" ) )
// .useCustomItemModel()
// .build();
// this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_1K ) )
// .item( ItemCraftingStorage::new )
// .tileEntity( new TileEntityDefinition( TileCraftingStorageTile.class, "crafting_storage" ) )
// .rendering( new CraftingCubeRendering( "crafting_storage_1k", CraftingUnitType.STORAGE_1K ) )
// .useCustomItemModel()
// .build();
// this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_4K ) )
// .item( ItemCraftingStorage::new )
// .tileEntity( new TileEntityDefinition( TileCraftingStorageTile.class, "crafting_storage" ) )
// .rendering( new CraftingCubeRendering( "crafting_storage_4k", CraftingUnitType.STORAGE_4K ) )
// .useCustomItemModel()
// .build();
// this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_16K ) )
// .item( ItemCraftingStorage::new )
// .tileEntity( new TileEntityDefinition( TileCraftingStorageTile.class, "crafting_storage" ) )
// .rendering( new CraftingCubeRendering( "crafting_storage_16k", CraftingUnitType.STORAGE_16K ) )
// .useCustomItemModel()
// .build();
// this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( CraftingUnitType.STORAGE_64K ) )
// .item( ItemCraftingStorage::new )
// .tileEntity( new TileEntityDefinition( TileCraftingStorageTile.class, "crafting_storage" ) )
// .rendering( new CraftingCubeRendering( "crafting_storage_64k", CraftingUnitType.STORAGE_64K ) )
// .useCustomItemModel()
// .build();
// this.craftingMonitor = crafting.block( "crafting_monitor", BlockCraftingMonitor::new )
// .tileEntity( registry.tileEntity("", TileCraftingMonitorTile.class, TileCraftingMonitorTile::new).build() )
// .rendering( new CraftingCubeRendering( "crafting_monitor", CraftingUnitType.MONITOR ) )
// .useCustomItemModel()
// .build();
//
// this.molecularAssembler = registry.block( "molecular_assembler", BlockMolecularAssembler::new )
// .features( AEFeature.MOLECULAR_ASSEMBLER )
// .tileEntity( registry.tileEntity("", TileMolecularAssembler.class, TileMolecularAssembler::new).build() )
// .build();
TileEntityDefinition craftingUnit = registry.tileEntity("crafting_unit", TileCraftingTile.class, TileCraftingTile::new)
.build();
FeatureFactory crafting = registry.features( AEFeature.CRAFTING_CPU );
Block.Properties craftingBlockProps = Block.Properties.create(Material.IRON);
this.craftingUnit = crafting.block( "crafting_unit", () -> new CraftingUnitBlock( craftingBlockProps, CraftingUnitType.UNIT ) )
.rendering( new CraftingCubeRendering( "crafting_unit", CraftingUnitType.UNIT ) )
.tileEntity( craftingUnit )
.build();
this.craftingAccelerator = crafting.block( "crafting_accelerator", () -> new CraftingUnitBlock( craftingBlockProps, CraftingUnitType.ACCELERATOR ) )
.rendering( new CraftingCubeRendering( "crafting_accelerator", CraftingUnitType.ACCELERATOR ) )
.tileEntity( craftingUnit )
.build();
TileEntityDefinition craftingStorage = registry.tileEntity("crafting_storage", TileCraftingStorageTile.class, TileCraftingStorageTile::new)
.build();
this.craftingStorage1k = crafting.block( "crafting_storage_1k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_1K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering( "crafting_storage_1k", CraftingUnitType.STORAGE_1K ) )
.build();
this.craftingStorage4k = crafting.block( "crafting_storage_4k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_4K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering( "crafting_storage_4k", CraftingUnitType.STORAGE_4K ) )
.build();
this.craftingStorage16k = crafting.block( "crafting_storage_16k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_16K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering( "crafting_storage_16k", CraftingUnitType.STORAGE_16K ) )
.build();
this.craftingStorage64k = crafting.block( "crafting_storage_64k", () -> new BlockCraftingStorage( craftingBlockProps, CraftingUnitType.STORAGE_64K ) )
.item( ItemCraftingStorage::new )
.tileEntity(craftingStorage)
.rendering( new CraftingCubeRendering( "crafting_storage_64k", CraftingUnitType.STORAGE_64K ) )
.build();
this.craftingMonitor = crafting.block( "crafting_monitor", () -> new BlockCraftingMonitor(craftingBlockProps) )
.tileEntity( registry.tileEntity("", TileCraftingMonitorTile.class, TileCraftingMonitorTile::new)
.rendering(new TileEntityRenderingCustomizer<TileCraftingMonitorTile>() {
@OnlyIn(Dist.CLIENT)
@Override
public void customize(TileEntityRendering<TileCraftingMonitorTile> rendering) {
// FIXME rendering.tileEntityRenderer(CraftingMonitorTESR::new);
}
})
.build() )
.rendering( new CraftingCubeRendering( "crafting_monitor", CraftingUnitType.MONITOR ) )
.build();
this.molecularAssembler = registry.block( "molecular_assembler", () -> new BlockMolecularAssembler(Block.Properties.create(Material.IRON).notSolid()) )
.features( AEFeature.MOLECULAR_ASSEMBLER )
.rendering(new BlockRenderingCustomizer() {
@OnlyIn(Dist.CLIENT)
@Override
public void customize(IBlockRendering rendering, IItemRendering itemRendering) {
// FIXME: This is an old comment, check if it still applies
/**
* NOTE: This is only used to determine how to render an item being held in hand.
* For determining block rendering, the method below is used (canRenderInLayer).
*/
rendering.renderType(RenderType.getCutout());
rendering.renderType(rt -> rt == RenderType.getCutout() || rt == RenderType.getTranslucent());
}
})
.tileEntity( registry.tileEntity("molecular_assembler", TileMolecularAssembler.class, TileMolecularAssembler::new).build() )
.build();
// this.lightDetector = registry.block( "light_detector", BlockLightDetector::new )
// .features( AEFeature.LIGHT_DETECTOR )
// .tileEntity( registry.tileEntity("", TileLightDetector.class, TileLightDetector::new).build() )
src/main/java/appeng/core/features/registries/MatterCannonAmmoRegistry.java
+82 -83
View File
@@ -25,17 +25,16 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import appeng.api.features.IMatterCannonAmmoRegistry;
import appeng.recipes.ores.IOreListener;
public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmoRegistry
public class MatterCannonAmmoRegistry implements /* FIXME IOreListener, */ IMatterCannonAmmoRegistry
{
private final HashMap<ItemStack, Double> DamageModifiers = new HashMap<>();
public MatterCannonAmmoRegistry()
{
OreDictionaryHandler.INSTANCE.observe( this );
// FIXME OreDictionaryHandler.INSTANCE.observe( this );
this.registerAmmo( new ItemStack( Items.GOLD_NUGGET ), 196.96655 );
}
@@ -58,86 +57,86 @@ public class MatterCannonAmmoRegistry implements IOreListener, IMatterCannonAmmo
return 0;
}
@Override
public void oreRegistered( final String name, final ItemStack item )
{
if( !( name.startsWith( "berry" ) || name.startsWith( "nugget" ) ) )
{
return;
}
// addNugget( "Cobble", 18 ); // ?
this.considerItem( name, item, "MeatRaw", 32 );
this.considerItem( name, item, "MeatCooked", 32 );
this.considerItem( name, item, "Meat", 32 );
this.considerItem( name, item, "Chicken", 32 );
this.considerItem( name, item, "Beef", 32 );
this.considerItem( name, item, "Sheep", 32 );
this.considerItem( name, item, "Fish", 32 );
// real world...
this.considerItem( name, item, "Lithium", 6.941 );
this.considerItem( name, item, "Beryllium", 9.0122 );
this.considerItem( name, item, "Boron", 10.811 );
this.considerItem( name, item, "Carbon", 12.0107 );
this.considerItem( name, item, "Coal", 12.0107 );
this.considerItem( name, item, "Charcoal", 12.0107 );
this.considerItem( name, item, "Sodium", 22.9897 );
this.considerItem( name, item, "Magnesium", 24.305 );
this.considerItem( name, item, "Aluminum", 26.9815 );
this.considerItem( name, item, "SILICON", 28.0855 );
this.considerItem( name, item, "Phosphorus", 30.9738 );
this.considerItem( name, item, "Sulfur", 32.065 );
this.considerItem( name, item, "Potassium", 39.0983 );
this.considerItem( name, item, "Calcium", 40.078 );
this.considerItem( name, item, "Scandium", 44.9559 );
this.considerItem( name, item, "Titanium", 47.867 );
this.considerItem( name, item, "Vanadium", 50.9415 );
this.considerItem( name, item, "Manganese", 54.938 );
this.considerItem( name, item, "Iron", 55.845 );
this.considerItem( name, item, "Nickel", 58.6934 );
this.considerItem( name, item, "Cobalt", 58.9332 );
this.considerItem( name, item, "Copper", 63.546 );
this.considerItem( name, item, "Zinc", 65.39 );
this.considerItem( name, item, "Gallium", 69.723 );
this.considerItem( name, item, "Germanium", 72.64 );
this.considerItem( name, item, "Bromine", 79.904 );
this.considerItem( name, item, "Krypton", 83.8 );
this.considerItem( name, item, "Rubidium", 85.4678 );
this.considerItem( name, item, "Strontium", 87.62 );
this.considerItem( name, item, "Yttrium", 88.9059 );
this.considerItem( name, item, "Zirconiumm", 91.224 );
this.considerItem( name, item, "Niobiumm", 92.9064 );
this.considerItem( name, item, "Technetium", 98 );
this.considerItem( name, item, "Ruthenium", 101.07 );
this.considerItem( name, item, "Rhodium", 102.9055 );
this.considerItem( name, item, "Palladium", 106.42 );
this.considerItem( name, item, "Silver", 107.8682 );
this.considerItem( name, item, "Cadmium", 112.411 );
this.considerItem( name, item, "Indium", 114.818 );
this.considerItem( name, item, "Tin", 118.71 );
this.considerItem( name, item, "Antimony", 121.76 );
this.considerItem( name, item, "Iodine", 126.9045 );
this.considerItem( name, item, "Tellurium", 127.6 );
this.considerItem( name, item, "Xenon", 131.293 );
this.considerItem( name, item, "Cesium", 132.9055 );
this.considerItem( name, item, "Barium", 137.327 );
this.considerItem( name, item, "Lanthanum", 138.9055 );
this.considerItem( name, item, "Cerium", 140.116 );
this.considerItem( name, item, "Tantalum", 180.9479 );
this.considerItem( name, item, "Tungsten", 183.84 );
this.considerItem( name, item, "Osmium", 190.23 );
this.considerItem( name, item, "Iridium", 192.217 );
this.considerItem( name, item, "Platinum", 195.078 );
this.considerItem( name, item, "Lead", 207.2 );
this.considerItem( name, item, "Bismuth", 208.9804 );
this.considerItem( name, item, "Uranium", 238.0289 );
this.considerItem( name, item, "Plutonium", 244 );
// TE stuff...
this.considerItem( name, item, "Invar", ( 58.6934 + 55.845 + 55.845 ) / 3.0 );
this.considerItem( name, item, "Electrum", ( 107.8682 + 196.96655 ) / 2.0 );
}
// FIXME @Override
// FIXME public void oreRegistered( final String name, final ItemStack item )
// FIXME {
// FIXME if( !( name.startsWith( "berry" ) || name.startsWith( "nugget" ) ) )
// FIXME {
// FIXME return;
// FIXME }
// FIXME
// FIXME // addNugget( "Cobble", 18 ); // ?
// FIXME this.considerItem( name, item, "MeatRaw", 32 );
// FIXME this.considerItem( name, item, "MeatCooked", 32 );
// FIXME this.considerItem( name, item, "Meat", 32 );
// FIXME this.considerItem( name, item, "Chicken", 32 );
// FIXME this.considerItem( name, item, "Beef", 32 );
// FIXME this.considerItem( name, item, "Sheep", 32 );
// FIXME this.considerItem( name, item, "Fish", 32 );
// FIXME
// FIXME // real world...
// FIXME this.considerItem( name, item, "Lithium", 6.941 );
// FIXME this.considerItem( name, item, "Beryllium", 9.0122 );
// FIXME this.considerItem( name, item, "Boron", 10.811 );
// FIXME this.considerItem( name, item, "Carbon", 12.0107 );
// FIXME this.considerItem( name, item, "Coal", 12.0107 );
// FIXME this.considerItem( name, item, "Charcoal", 12.0107 );
// FIXME this.considerItem( name, item, "Sodium", 22.9897 );
// FIXME this.considerItem( name, item, "Magnesium", 24.305 );
// FIXME this.considerItem( name, item, "Aluminum", 26.9815 );
// FIXME this.considerItem( name, item, "SILICON", 28.0855 );
// FIXME this.considerItem( name, item, "Phosphorus", 30.9738 );
// FIXME this.considerItem( name, item, "Sulfur", 32.065 );
// FIXME this.considerItem( name, item, "Potassium", 39.0983 );
// FIXME this.considerItem( name, item, "Calcium", 40.078 );
// FIXME this.considerItem( name, item, "Scandium", 44.9559 );
// FIXME this.considerItem( name, item, "Titanium", 47.867 );
// FIXME this.considerItem( name, item, "Vanadium", 50.9415 );
// FIXME this.considerItem( name, item, "Manganese", 54.938 );
// FIXME this.considerItem( name, item, "Iron", 55.845 );
// FIXME this.considerItem( name, item, "Nickel", 58.6934 );
// FIXME this.considerItem( name, item, "Cobalt", 58.9332 );
// FIXME this.considerItem( name, item, "Copper", 63.546 );
// FIXME this.considerItem( name, item, "Zinc", 65.39 );
// FIXME this.considerItem( name, item, "Gallium", 69.723 );
// FIXME this.considerItem( name, item, "Germanium", 72.64 );
// FIXME this.considerItem( name, item, "Bromine", 79.904 );
// FIXME this.considerItem( name, item, "Krypton", 83.8 );
// FIXME this.considerItem( name, item, "Rubidium", 85.4678 );
// FIXME this.considerItem( name, item, "Strontium", 87.62 );
// FIXME this.considerItem( name, item, "Yttrium", 88.9059 );
// FIXME this.considerItem( name, item, "Zirconiumm", 91.224 );
// FIXME this.considerItem( name, item, "Niobiumm", 92.9064 );
// FIXME this.considerItem( name, item, "Technetium", 98 );
// FIXME this.considerItem( name, item, "Ruthenium", 101.07 );
// FIXME this.considerItem( name, item, "Rhodium", 102.9055 );
// FIXME this.considerItem( name, item, "Palladium", 106.42 );
// FIXME this.considerItem( name, item, "Silver", 107.8682 );
// FIXME this.considerItem( name, item, "Cadmium", 112.411 );
// FIXME this.considerItem( name, item, "Indium", 114.818 );
// FIXME this.considerItem( name, item, "Tin", 118.71 );
// FIXME this.considerItem( name, item, "Antimony", 121.76 );
// FIXME this.considerItem( name, item, "Iodine", 126.9045 );
// FIXME this.considerItem( name, item, "Tellurium", 127.6 );
// FIXME this.considerItem( name, item, "Xenon", 131.293 );
// FIXME this.considerItem( name, item, "Cesium", 132.9055 );
// FIXME this.considerItem( name, item, "Barium", 137.327 );
// FIXME this.considerItem( name, item, "Lanthanum", 138.9055 );
// FIXME this.considerItem( name, item, "Cerium", 140.116 );
// FIXME this.considerItem( name, item, "Tantalum", 180.9479 );
// FIXME this.considerItem( name, item, "Tungsten", 183.84 );
// FIXME this.considerItem( name, item, "Osmium", 190.23 );
// FIXME this.considerItem( name, item, "Iridium", 192.217 );
// FIXME this.considerItem( name, item, "Platinum", 195.078 );
// FIXME this.considerItem( name, item, "Lead", 207.2 );
// FIXME this.considerItem( name, item, "Bismuth", 208.9804 );
// FIXME this.considerItem( name, item, "Uranium", 238.0289 );
// FIXME this.considerItem( name, item, "Plutonium", 244 );
// FIXME
// FIXME // TE stuff...
// FIXME this.considerItem( name, item, "Invar", ( 58.6934 + 55.845 + 55.845 ) / 3.0 );
// FIXME this.considerItem( name, item, "Electrum", ( 107.8682 + 196.96655 ) / 2.0 );
// FIXME }
private void considerItem( final String ore, final ItemStack item, final String name, final double weight )
{
src/main/java/appeng/core/features/registries/P2PTunnelRegistry.java
+32 -32
View File
@@ -77,22 +77,22 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
this.addNewAttunement( blocks.energyCell(), TunnelType.FE_POWER );
this.addNewAttunement( blocks.energyCellCreative(), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 0 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 1 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 2 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 3 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 4 ), TunnelType.FE_POWER );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_0", 5 ), TunnelType.FE_POWER );
/**
* EU tunnel items
*/
this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable
this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable
this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable
this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable
this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable
// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 0 ), TunnelType.IC2_POWER ); // Copper cable
// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 1 ), TunnelType.IC2_POWER ); // Glass fibre cable
// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 2 ), TunnelType.IC2_POWER ); // Gold cable
// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 3 ), TunnelType.IC2_POWER ); // HV cable
// FIXME this.addNewAttunement( this.getModItem( "ic2", "cable", 4 ), TunnelType.IC2_POWER ); // Tin cable
/**
* attune based on most redstone base items.
@@ -119,15 +119,15 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
this.addNewAttunement( new ItemStack( Blocks.HOPPER ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.CHEST ), TunnelType.ITEM );
this.addNewAttunement( new ItemStack( Blocks.TRAPPED_CHEST ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
// (opaque)
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
// itemduct
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
// itemduct
// FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 0 ), TunnelType.ITEM );
// FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 9 ), TunnelType.ITEM );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 0 ), TunnelType.ITEM ); // itemduct
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 1 ), TunnelType.ITEM ); // itemduct
// FIXME // (opaque)
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 2 ), TunnelType.ITEM ); // impulse
// FIXME // itemduct
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_32", 3 ), TunnelType.ITEM ); // impulse
// FIXME // itemduct
// (opaque)
/**
@@ -137,18 +137,18 @@ public final class P2PTunnelRegistry implements IP2PTunnelRegistry
this.addNewAttunement( new ItemStack( Items.LAVA_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.MILK_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( new ItemStack( Items.WATER_BUCKET ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID );
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
// (opaque)
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
// hardened
this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
// hardened
// (opaque)
// FIXME this.addNewAttunement( this.getModItem( "mekanism", "machineblock2", 11 ), TunnelType.FLUID );
// FIXME this.addNewAttunement( this.getModItem( "mekanism", "parttransmitter", 4 ), TunnelType.FLUID );
// FIXME this.addNewAttunement( this.getModItem( "extrautilities", "extractor_base", 6 ), TunnelType.FLUID );
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 0 ), TunnelType.FLUID ); // fluiduct
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 1 ), TunnelType.FLUID ); // fluiduct
// FIXME // (opaque)
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 2 ), TunnelType.FLUID ); // fluiduct
// FIXME // hardened
// FIXME this.addNewAttunement( this.getModItem( "thermaldynamics", "duct_16", 3 ), TunnelType.FLUID ); // fluiduct
// FIXME // hardened
// FIXME // (opaque)
// FIXME
for( final AEColor c : AEColor.values() )
{
this.addNewAttunement( parts.cableGlass().stack( c, 1 ), TunnelType.ME );
src/main/java/appeng/core/features/registries/WirelessRegistry.java
+2 -2
View File
@@ -32,7 +32,7 @@ import appeng.api.features.IWirelessTermHandler;
import appeng.api.features.IWirelessTermRegistry;
import appeng.core.Api;
import appeng.core.localization.PlayerMessages;
import appeng.core.sync.GuiBridge;
import appeng.util.Platform;
@@ -112,7 +112,7 @@ public final class WirelessRegistry implements IWirelessTermRegistry
if( handler.hasPower( player, 0.5, item ) )
{
Platform.openGUI( player, null, null, GuiBridge.GUI_WIRELESS_TERM );
// FIXME Platform.openGUI( player, null, null, GuiBridge.GUI_WIRELESS_TERM );
}
else
{
src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java
+2 -2
View File
@@ -16,7 +16,7 @@ import appeng.api.storage.channels.IItemStorageChannel;
import appeng.api.storage.data.IAEStack;
import appeng.api.util.AEPartLocation;
import appeng.core.Api;
import appeng.core.sync.GuiBridge;
import appeng.util.Platform;
@@ -31,6 +31,6 @@ public class BasicItemCellGuiHandler implements ICellGuiHandler
@Override
public void openChestGui( final PlayerEntity player, final IChestOrDrive chest, final ICellHandler cellHandler, final IMEInventoryHandler inv, final ItemStack is, final IStorageChannel chan )
{
Platform.openGUI( player, (TileEntity) chest, AEPartLocation.fromFacing( chest.getUp() ), GuiBridge.GUI_ME );
// FIXME Platform.openGUI( player, (TileEntity) chest, AEPartLocation.fromFacing( chest.getUp() ), GuiBridge.GUI_ME );
}
}
src/main/java/appeng/core/features/registries/grinder/GrinderRecipeManager.java
+25 -26
View File
@@ -41,11 +41,10 @@ import appeng.api.features.IInscriberRecipe;
import appeng.api.features.IInscriberRecipeBuilder;
import appeng.core.AEConfig;
import appeng.core.AELog;
import appeng.recipes.ores.IOreListener;
import appeng.util.Platform;
public final class GrinderRecipeManager implements IGrinderRegistry, IOreListener
public final class GrinderRecipeManager implements IGrinderRegistry // FIXME, IOreListener
{
private final Map<CacheKey, IGrinderRecipe> recipes;
private final Map<ItemStack, String> ores;
@@ -84,7 +83,7 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
this.addIngot( "Wheat", new ItemStack( Items.WHEAT ) );
OreDictionaryHandler.INSTANCE.observe( this );
// FIXME OreDictionaryHandler.INSTANCE.observe( this );
}
@Override
@@ -162,29 +161,29 @@ public final class GrinderRecipeManager implements IGrinderRegistry, IOreListene
return this.dustToOreRatio.remove( oredictName ) != null;
}
@Override
public void oreRegistered( final String name, final ItemStack item )
{
if( !AEConfig.instance().getGrinderBlackList().contains( name ) && ( name.startsWith( "ore" ) || name.startsWith( "crystal" ) || name
.startsWith( "gem" ) || name.startsWith( "ingot" ) || name.startsWith( "dust" ) ) )
{
for( final String ore : AEConfig.instance().getGrinderOres() )
{
if( name.equals( "ore" + ore ) )
{
this.addOre( ore, item );
}
else if( name.equals( "crystal" + ore ) || name.equals( "ingot" + ore ) || name.equals( "gem" + ore ) )
{
this.addIngot( ore, item );
}
else if( name.equals( "dust" + ore ) )
{
this.addDust( ore, item );
}
}
}
}
// FIXME @Override
// FIXME public void oreRegistered( final String name, final ItemStack item )
// FIXME {
// FIXME if( !AEConfig.instance().getGrinderBlackList().contains( name ) && ( name.startsWith( "ore" ) || name.startsWith( "crystal" ) || name
// FIXME .startsWith( "gem" ) || name.startsWith( "ingot" ) || name.startsWith( "dust" ) ) )
// FIXME {
// FIXME for( final String ore : AEConfig.instance().getGrinderOres() )
// FIXME {
// FIXME if( name.equals( "ore" + ore ) )
// FIXME {
// FIXME this.addOre( ore, item );
// FIXME }
// FIXME else if( name.equals( "crystal" + ore ) || name.equals( "ingot" + ore ) || name.equals( "gem" + ore ) )
// FIXME {
// FIXME this.addIngot( ore, item );
// FIXME }
// FIXME else if( name.equals( "dust" + ore ) )
// FIXME {
// FIXME this.addDust( ore, item );
// FIXME }
// FIXME }
// FIXME }
// FIXME }
private boolean injectRecipe( final IGrinderRecipe grinderRecipe )
{
src/main/java/appeng/core/localization/GuiText.java
+6
View File
@@ -20,6 +20,8 @@ package appeng.core.localization;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.TranslationTextComponent;
public enum GuiText
@@ -220,4 +222,8 @@ public enum GuiText
return this.root + '.' + this.toString();
}
public ITextComponent textComponent() {
return new TranslationTextComponent(getTranslationKey());
}
}
src/main/java/appeng/core/sync/packets/PacketCompassResponse.java
+1 -2
View File
@@ -19,6 +19,7 @@
package appeng.core.sync.packets;
import appeng.hooks.CompassResult;
import io.netty.buffer.Unpooled;
import net.minecraft.entity.player.PlayerEntity;
@@ -26,8 +27,6 @@ import net.minecraft.network.PacketBuffer;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.hooks.CompassManager;
import appeng.hooks.CompassResult;
public class PacketCompassResponse extends AppEngPacket
src/main/java/appeng/core/sync/packets/PacketCraftRequest.java
+1 -3
View File
@@ -37,9 +37,7 @@ import appeng.container.implementations.ContainerCraftAmount;
import appeng.container.implementations.ContainerCraftConfirm;
import appeng.core.AELog;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.Platform;
public class PacketCraftRequest extends AppEngPacket
@@ -102,7 +100,7 @@ public class PacketCraftRequest extends AppEngPacket
if( context != null )
{
final TileEntity te = context.getTile();
Platform.openGUI( player, te, cca.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_CONFIRM );
// FIXME Platform.openGUI( player, te, cca.getOpenContext().getSide(), GuiBridge.GUI_CRAFTING_CONFIRM );
if( player.openContainer instanceof ContainerCraftConfirm )
{
src/main/java/appeng/core/sync/packets/PacketMEFluidInventoryUpdate.java
+4 -5
View File
@@ -44,7 +44,6 @@ import appeng.api.storage.data.IAEFluidStack;
import appeng.core.AELog;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
import appeng.fluids.client.gui.GuiFluidTerminal;
import appeng.fluids.util.AEFluidStack;
@@ -156,10 +155,10 @@ public class PacketMEFluidInventoryUpdate extends AppEngPacket
{
final Screen gs = Minecraft.getInstance().currentScreen;
if( gs instanceof GuiFluidTerminal )
{
( (GuiFluidTerminal) gs ).postUpdate( this.list );
}
// FIXME if( gs instanceof GuiFluidTerminal )
// FIXME {
// FIXME ( (GuiFluidTerminal) gs ).postUpdate( this.list );
// FIXME }
}
@Nullable
src/main/java/appeng/core/sync/packets/PacketMEInventoryUpdate.java
+19 -23
View File
@@ -41,10 +41,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.network.NetworkDirection;
import appeng.api.storage.data.IAEItemStack;
import appeng.client.gui.implementations.GuiCraftConfirm;
import appeng.client.gui.implementations.GuiCraftingCPU;
import appeng.client.gui.implementations.GuiMEMonitorable;
import appeng.client.gui.implementations.GuiNetworkStatus;
import appeng.core.AELog;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
@@ -153,25 +149,25 @@ public class PacketMEInventoryUpdate extends AppEngPacket
{
final Screen gs = Minecraft.getInstance().currentScreen;
if( gs instanceof GuiCraftConfirm )
{
( (GuiCraftConfirm) gs ).postUpdate( this.list, this.ref );
}
if( gs instanceof GuiCraftingCPU )
{
( (GuiCraftingCPU) gs ).postUpdate( this.list, this.ref );
}
if( gs instanceof GuiMEMonitorable )
{
( (GuiMEMonitorable) gs ).postUpdate( this.list );
}
if( gs instanceof GuiNetworkStatus )
{
( (GuiNetworkStatus) gs ).postUpdate( this.list );
}
// FIXME if( gs instanceof GuiCraftConfirm )
// FIXME {
// FIXME ( (GuiCraftConfirm) gs ).postUpdate( this.list, this.ref );
// FIXME }
// FIXME
// FIXME if( gs instanceof GuiCraftingCPU )
// FIXME {
// FIXME ( (GuiCraftingCPU) gs ).postUpdate( this.list, this.ref );
// FIXME }
// FIXME
// FIXME if( gs instanceof GuiMEMonitorable )
// FIXME {
// FIXME ( (GuiMEMonitorable) gs ).postUpdate( this.list );
// FIXME }
// FIXME
// FIXME if( gs instanceof GuiNetworkStatus )
// FIXME {
// FIXME ( (GuiNetworkStatus) gs ).postUpdate( this.list );
// FIXME }
}
@Nullable
src/main/java/appeng/core/sync/packets/PacketMatterCannon.java
+2 -5
View File
@@ -23,14 +23,11 @@ import io.netty.buffer.Unpooled;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.PacketBuffer;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.client.render.effects.MatterCannonFX;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.network.INetworkInfo;
@@ -95,9 +92,9 @@ public class PacketMatterCannon extends AppEngPacket
final World world = Minecraft.getInstance().world;
for( int a = 1; a < this.len; a++ )
{
final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, new ItemStack( Items.DIAMOND ) );
// FIXME final MatterCannonFX fx = new MatterCannonFX( world, this.x + this.dx * a, this.y + this.dy * a, this.z + this.dz * a, new ItemStack( Items.DIAMOND ) );
Minecraft.getInstance().particles.addEffect( fx );
// FIXME Minecraft.getInstance().particles.addEffect( fx );
}
}
catch( final Exception ignored )
src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java
+1 -1
View File
@@ -29,7 +29,7 @@ import net.minecraft.tileentity.TileEntity;
import appeng.container.AEBaseContainer;
import appeng.container.ContainerOpenContext;
import appeng.core.sync.AppEngPacket;
import appeng.core.sync.GuiBridge;
import appeng.core.sync.network.INetworkInfo;
import appeng.util.Platform;
src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java
+2 -1
View File
@@ -26,6 +26,7 @@ import net.minecraft.block.SoundType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.audio.SimpleSound;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.SoundCategory;
@@ -94,7 +95,7 @@ public class PacketTransitionEffect extends AppEngPacket
final EnergyFx fx = new EnergyFx( world, this.x + ( this.mode ? ( Platform
.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.y + ( this.mode ? ( Platform
.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), this.z + ( this.mode ? ( Platform
.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), Items.DIAMOND );
.getRandomInt() % 100 ) * 0.01 : ( Platform.getRandomInt() % 100 ) * 0.005 - 0.25 ), new ItemStack(Items.DIAMOND, 1) );
if( !this.mode )
{