diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index c524dc72f..fd64c3473 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -710,8 +710,9 @@ a63b57c27d8548ddd13d64d18b098d4f5c127a30 data/actuallyadditions/recipes/restonia 85d2537a973d520c9eaaf2f15109c265faa2df3a data/actuallyadditions/recipes/rice_slime_potion.json d4ca5d77d16ff6fdfc60e665694fdd97bce25463 data/actuallyadditions/recipes/shock_suppressor.json 655fab699bb97ec252deb61d91fbef6f4738fe1c data/actuallyadditions/recipes/single_battery.json -f4b41a12da3d0d24f155a6fb0fc170eeea9947b0 data/actuallyadditions/recipes/solid_fuel/charcoal.json -ddae8379266c710a96811ab1d68bfb9973db7515 data/actuallyadditions/recipes/solid_fuel/coal.json +8cb9b0e94a5de6e0bb74d808207ddf041d444280 data/actuallyadditions/recipes/solid_fuel/charcoal.json +3a4c2b0ca2e150ef24edb2defe018f6574cb4827 data/actuallyadditions/recipes/solid_fuel/coal.json +9d2105a32a4781f3fd10a70f97ba243b1c0ceb34 data/actuallyadditions/recipes/solid_fuel/stick.json 8ebd738f3968564e22ba6841eb821e5064c78588 data/actuallyadditions/recipes/stone_aiot.json bc7a41d9f36cc43e146e0b727b6f439cc0d29343 data/actuallyadditions/recipes/teleport_staff.json bdf7dbf563485903e444400d341e56d0bf308481 data/actuallyadditions/recipes/tiny_torch.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal.json index bc5b612bf..f8c592b45 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal.json +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/charcoal.json @@ -3,6 +3,6 @@ "item": { "item": "minecraft:charcoal" }, - "total_energy": 1600, - "burn_time": 48000 + "total_energy": 48000, + "burn_time": 1600 } \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal.json b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal.json index 184cee810..ba2f65c9a 100644 --- a/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal.json +++ b/src/generated/resources/data/actuallyadditions/recipes/solid_fuel/coal.json @@ -3,6 +3,6 @@ "item": { "item": "minecraft:coal" }, - "total_energy": 1600, - "burn_time": 48000 + "total_energy": 48000, + "burn_time": 1600 } \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/SolidFuelGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/SolidFuelGenerator.java index ff1fc5606..467cdec3d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/SolidFuelGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/SolidFuelGenerator.java @@ -29,16 +29,17 @@ public class SolidFuelGenerator extends RecipeProvider { @Override protected void buildShapelessRecipes(Consumer consumer) { addFuel(consumer, "coal", Items.COAL, 48000, 1600); + addFuel(consumer, "stick", Items.STICK, 1000, 200); //TEST addFuel(consumer, "charcoal", Items.CHARCOAL, 48000, 1600); } private void addFuel(Consumer consumer, String name, Item item, int energy, int burnTime) { - consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), Ingredient.of(item), burnTime, energy)); + consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), Ingredient.of(item), energy, burnTime)); } private void addFuel(Consumer consumer, String name, Ingredient item, int energy, int burnTime) { - consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), item, burnTime, energy)); + consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), item, energy, burnTime)); } private void addFuel(Consumer consumer, String name, ITag tag, int energy, int burnTime) { - consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), Ingredient.of(tag), burnTime, energy)); + consumer.accept(new SolidFuelRecipe.FinishedRecipe(new ResourceLocation(ActuallyAdditions.MODID, "solid_fuel/"+name), Ingredient.of(tag), energy, burnTime)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java index aacaca46c..599f52a34 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockAtomicReconstructor.java @@ -89,7 +89,7 @@ public class BlockAtomicReconstructor extends FullyDirectionalBlock.Container im } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityAtomicReconstructor(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java index f87f381d9..d7698f352 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBatteryBox.java @@ -39,7 +39,7 @@ public class BlockBatteryBox extends BlockContainerBase { // } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityBatteryBox(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java index 93b734507..9b1a9df8e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBioReactor.java @@ -28,7 +28,7 @@ public class BlockBioReactor extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0, 2.0F, 10.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityBioReactor(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java index e4fe36d99..0511cea4a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockBreaker.java @@ -35,7 +35,7 @@ public class BlockBreaker extends FullyDirectionalBlock.Container { } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader world) { return this.isPlacer ? new TileEntityPlacer() diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java index 0fee818aa..34812d824 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCanolaPress.java @@ -40,7 +40,7 @@ public class BlockCanolaPress extends BlockContainerBase { // } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader world) { return new TileEntityCanolaPress(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java index 8e3ff03f5..bad352fb5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoalGenerator.java @@ -26,6 +26,7 @@ import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraft.world.server.ServerWorld; +import javax.annotation.Nullable; import java.util.Random; public class BlockCoalGenerator extends DirectionalBlock.Container { @@ -34,7 +35,13 @@ public class BlockCoalGenerator extends DirectionalBlock.Container { } @Override - public TileEntity newBlockEntity(IBlockReader worldIn) { + public boolean hasTileEntity(BlockState state) { + return true; + } + + @Nullable + @Override + public TileEntity createTileEntity(BlockState state, IBlockReader world) { return new TileEntityCoalGenerator(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java index 58ded65fa..689b9e995 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCoffeeMachine.java @@ -48,7 +48,7 @@ public class BlockCoffeeMachine extends DirectionalBlock.Container { } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityCoffeeMachine(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java index ff62c517a..b876c5112 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockCrusher.java @@ -47,7 +47,7 @@ public class BlockCrusher extends BlockContainerBase { this.registerDefaultState(getStateDefinition().any().setValue(HORIZONTAL_FACING, Direction.NORTH).setValue(LIT, false)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return this.isDouble ? new TileEntityCrusherDouble() diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java index 2a5200ab9..00423a546 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDisplayStand.java @@ -36,7 +36,7 @@ public class BlockDisplayStand extends BlockContainerBase { } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityDisplayStand(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java index cfdd6591d..965f83993 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockDropper.java @@ -28,7 +28,7 @@ public class BlockDropper extends FullyDirectionalBlock.Container { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityDropper(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java index 67eac1f29..117228043 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEmpowerer.java @@ -35,7 +35,7 @@ public class BlockEmpowerer extends BlockContainerBase { } @Nullable - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityEmpowerer(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java index 46a233ad8..7af361da8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockEnergizer.java @@ -33,7 +33,7 @@ public class BlockEnergizer extends BlockContainerBase { this.isEnergizer = isEnergizer; } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return this.isEnergizer ? new TileEntityEnergizer() diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java index cca939004..11f00c9a6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFarmer.java @@ -30,7 +30,7 @@ public class BlockFarmer extends DirectionalBlock.Container { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityFarmer(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java index b9f8cc823..4357cea88 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFeeder.java @@ -30,7 +30,7 @@ public class BlockFeeder extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0, 0.5F, 6.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityFeeder(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java index 990ff3044..45c53c5cb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFermentingBarrel.java @@ -33,7 +33,7 @@ public class BlockFermentingBarrel extends BlockContainerBase { super(Properties.of(Material.WOOD).harvestTool(ToolType.AXE).harvestLevel(0).strength(0.5F, 5.0F).sound(SoundType.WOOD)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityFermentingBarrel(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java index fb020c90f..78ac11a02 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFireworkBox.java @@ -38,7 +38,7 @@ public class BlockFireworkBox extends BlockContainerBase { return this.openGui(world, player, pos, TileEntityFireworkBox.class); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityFireworkBox(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java index 6cad1b252..a086939f6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFluidCollector.java @@ -33,7 +33,7 @@ public class BlockFluidCollector extends FullyDirectionalBlock.Container { this.isPlacer = isPlacer; } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return this.isPlacer ? new TileEntityFluidPlacer() diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java index 3df53bb6c..03ea2bbd1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockHeatCollector.java @@ -24,7 +24,7 @@ public class BlockHeatCollector extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0, 2.5F, 10.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityHeatCollector(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemInterface.java index e3408e28a..99ead10a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemInterface.java @@ -26,7 +26,7 @@ public class BlockItemInterface extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityItemInterface(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 4cda1c24a..fc14bd0ca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -146,7 +146,7 @@ public class BlockLaserRelay extends FullyDirectionalBlock.Container implements return ActionResultType.FAIL; } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader world) { switch (this.type) { case ITEM: diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index dc8f14c9a..851b92fd9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -37,7 +37,7 @@ public class BlockLavaFactoryController extends DirectionalBlock.Container imple super(ActuallyBlocks.defaultPickProps(0, 4.5F, 20.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityLavaFactoryController(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java index 5f2007192..5da468e85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLeafGenerator.java @@ -30,7 +30,7 @@ public class BlockLeafGenerator extends DirectionalBlock.Container { super(Properties.of(Material.METAL).strength(5.0F, 10.0F).harvestTool(ToolType.PICKAXE).harvestLevel(0).strength(5.0F, 10.0F).sound(SoundType.METAL)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityLeafGenerator(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java index d12535f88..6748b01c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLongRangeBreaker.java @@ -30,7 +30,7 @@ public class BlockLongRangeBreaker extends FullyDirectionalBlock.Container { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityLongRangeBreaker(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index 2794298fa..c19f0388d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -36,7 +36,7 @@ public class BlockOilGenerator extends DirectionalBlock.Container { super(ActuallyBlocks.defaultPickProps(0).randomTicks()); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityOilGenerator(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index b88076f58..3b1a5ca86 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -80,7 +80,7 @@ public class BlockPhantom extends BlockContainerBase implements IHudDisplay { return this.type == Type.PLACER || this.type == Type.BREAKER; } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { switch (this.type) { case PLACER: diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java index 1de69d4f3..01846a1ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantomBooster.java @@ -25,7 +25,7 @@ public class BlockPhantomBooster extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader world) { return new TileEntityPhantomBooster(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java index 519350a6a..0cdd0e238 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java @@ -38,7 +38,7 @@ public class BlockPlayerInterface extends BlockContainerBase implements IHudDisp super(ActuallyBlocks.defaultPickProps(0, 4.5F, 10.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityPlayerInterface(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java index 99ee560ab..0527265ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPoweredFurnace.java @@ -45,7 +45,7 @@ public class BlockPoweredFurnace extends BlockContainerBase { registerDefaultState(getStateDefinition().any().setValue(HORIZONTAL_FACING, Direction.NORTH).setValue(LIT, false)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityPoweredFurnace(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java index 913ab40e0..9a65baa51 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockRangedCollector.java @@ -30,7 +30,7 @@ public class BlockRangedCollector extends BlockContainerBase { super(ActuallyBlocks.defaultPickProps(0)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityRangedCollector(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java index c35934fde..f42dbcdac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockVerticalDigger.java @@ -44,7 +44,7 @@ public class BlockVerticalDigger extends DirectionalBlock.Container implements I return this.openGui(worldIn, player, pos, TileEntityVerticalDigger.class); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader world) { return new TileEntityVerticalDigger(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java index c72c4fe46..866002174 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockXPSolidifier.java @@ -29,7 +29,7 @@ public class BlockXPSolidifier extends DirectionalBlock.Container { super(ActuallyBlocks.defaultPickProps(0, 2.5F, 10.0F)); } - @Override + //@Override public TileEntity newBlockEntity(IBlockReader worldIn) { return new TileEntityXPSolidifier(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java index b47c22992..a00cec083 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java @@ -43,7 +43,7 @@ import net.minecraftforge.fml.network.NetworkHooks; import javax.annotation.Nullable; import java.util.Random; -public abstract class BlockContainerBase extends ContainerBlock { +public abstract class BlockContainerBase extends Block { public BlockContainerBase(Properties properties) { super(properties); } @@ -51,13 +51,13 @@ public abstract class BlockContainerBase extends ContainerBlock { public ActionResultType openGui(World world, PlayerEntity player, BlockPos pos, Class expectedInstance) { if (!world.isClientSide) { TileEntity tile = world.getBlockEntity(pos); - if (tile != null && tile.getClass().isInstance(expectedInstance)) { + if (expectedInstance.isInstance(tile)) { NetworkHooks.openGui((ServerPlayerEntity) player, (INamedContainerProvider) tile, pos); } return ActionResultType.SUCCESS; } - return ActionResultType.PASS; + return ActionResultType.SUCCESS; } private void dropInventory(World world, BlockPos position) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/DirectionalBlock.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/DirectionalBlock.java index 4832ad49b..5103935c7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/DirectionalBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/DirectionalBlock.java @@ -14,21 +14,21 @@ import net.minecraft.block.AbstractBlock.Properties; * Wrapper for Directional block states extending from our base blocks. It's not super nice but it'll do. */ public abstract class DirectionalBlock extends BlockBase { - // public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; - // + public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; + public DirectionalBlock(Properties properties) { super(properties); } - // - // @Override - // public BlockState getStateForPlacement(BlockItemUseContext context) { - // return this.getDefaultState().with(FACING, context.getNearestLookingDirection().getOpposite()); - // } - // - // @Override - // protected void fillStateContainer(StateContainer.Builder builder) { - // builder.add(FACING); - // } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) { + return this.defaultBlockState().setValue(FACING, context.getNearestLookingDirection().getOpposite()); + } + + @Override + protected void createBlockStateDefinition(StateContainer.Builder builder) { + builder.add(FACING); + } public abstract static class Container extends BlockContainerBase { public static final DirectionProperty FACING = BlockStateProperties.HORIZONTAL_FACING; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java index 3f46979f7..185e8f0f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java @@ -91,13 +91,6 @@ public enum ConfigIntValues { 1, Integer.MAX_VALUE, "The energy use of the Atomic Reconstructor's Mining Lens."), - COAL_GENERATOR_CF_PRODUCTION( - "Coal Generator Energy Production", - ConfigCategories.MACHINE_VALUES, - 30, - 1, - Integer.MAX_VALUE, - "The Coal Generator's Energy Production in CF/tick while burning."), LEAF_GENERATOR_COOLDOWN( "Leaf Generator Cooldown", ConfigCategories.MACHINE_VALUES, diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/AAScreen.java similarity index 60% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/AAScreen.java index 0b942d570..8d83c8716 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiWtfMojang.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/AAScreen.java @@ -14,18 +14,26 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; -public abstract class GuiWtfMojang extends ContainerScreen { +import javax.annotation.Nonnull; - public GuiWtfMojang(T inventorySlotsIn, PlayerInventory inventory) { - super(inventorySlotsIn, inventory, StringTextComponent.EMPTY); +public abstract class AAScreen extends ContainerScreen { + + public AAScreen(T container, PlayerInventory inventory, ITextComponent pTitle) { + super(container, inventory, pTitle); } @Override - public void render(MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { + public void render(@Nonnull MatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) { this.renderBackground(matrixStack); super.render(matrixStack, mouseX, mouseY, partialTicks); this.renderTooltip(matrixStack, mouseX, mouseY); } + + @Override + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { + font.draw(matrices, this.title, titleLabelX, titleLabelY, 0xFFFFFF); + } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/CrusherScreen.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/CrusherScreen.java index 78349fd6e..03e061618 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/CrusherScreen.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/CrusherScreen.java @@ -26,8 +26,10 @@ import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class CrusherScreen extends GuiWtfMojang { +public class CrusherScreen extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_grinder"); private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("gui_grinder_double"); @@ -38,7 +40,7 @@ public class CrusherScreen extends GuiWtfMojang { private Button buttonAutoSplit; public CrusherScreen(CrusherContainer container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.tileGrinder = container.tileGrinder; this.isDouble = container.isDouble; this.imageWidth = 176; @@ -76,7 +78,7 @@ public class CrusherScreen extends GuiWtfMojang { } @Override - public void render(MatrixStack matrixStack, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrixStack, int x, int y, float f) { super.render(matrixStack, x, y, f); this.energy.render(matrixStack, x, y); @@ -87,7 +89,7 @@ public class CrusherScreen extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tileGrinder); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java index 241e67471..778a360d9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java @@ -17,8 +17,10 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.AbstractGui; import net.minecraft.client.resources.I18n; +import net.minecraft.util.text.StringTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.fml.client.gui.GuiUtils; import java.text.NumberFormat; import java.util.ArrayList; @@ -82,9 +84,9 @@ public class EnergyDisplay extends AbstractGui { if (this.isMouseOver(mouseX, mouseY)) { Minecraft mc = Minecraft.getInstance(); - List text = new ArrayList<>(); - text.add(this.getOverlayText()); - //GuiUtils.drawHoveringText(matrices, text, mouseX, mouseY, mc.getWindow().getWidth(), mc.getWindow().getHeight(), -1, mc.font); + List text = new ArrayList<>(); + text.add(new StringTextComponent(this.getOverlayText())); + GuiUtils.drawHoveringText(matrices, text, mouseX, mouseY, mc.getWindow().getWidth(), mc.getWindow().getHeight(), -1, mc.font); } } @@ -98,6 +100,6 @@ public class EnergyDisplay extends AbstractGui { private String getOverlayText() { NumberFormat format = NumberFormat.getInstance(); - return String.format("%s/%s %s", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()), I18n.get("actuallyadditions.cflong")); + return String.format("%s/%s %s", format.format(this.rfReference.getEnergyStored()), format.format(this.rfReference.getMaxEnergyStored()), I18n.get("actuallyadditions.fe")); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java index f305198f7..9dfcf9886 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java @@ -19,7 +19,9 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; -public class GuiBag extends GuiWtfMojang { +import javax.annotation.Nonnull; + +public class GuiBag extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bag"); private static final ResourceLocation RES_LOC_VOID = AssetUtil.getGuiLocation("gui_void_bag"); @@ -29,7 +31,7 @@ public class GuiBag extends GuiWtfMojang { private Button buttonAutoInsert; public GuiBag(ContainerBag container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.imageWidth = 176; this.imageHeight = 90 + 86; this.isVoid = container.isVoid; @@ -75,7 +77,7 @@ public class GuiBag extends GuiWtfMojang { }*/ @Override - public void render(MatrixStack stack, int mouseX, int mouseY, float partialTicks) { + public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) { super.render(stack, mouseX, mouseY, partialTicks); this.filter.drawHover(mouseX, mouseY); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java index b40a94bf2..75f498123 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java @@ -20,14 +20,16 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; -public class GuiBioReactor extends GuiWtfMojang { +import javax.annotation.Nonnull; + +public class GuiBioReactor extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bio_reactor"); private final TileEntityBioReactor tile; private EnergyDisplay energy; public GuiBioReactor(ContainerBioReactor container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.tile = container.tile; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -40,13 +42,13 @@ public class GuiBioReactor extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { + public void render(@Nonnull MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { super.render(matrices, mouseX, mouseY, partialTicks); //this.energy.render(mouseX, mouseY); } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tile); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java index bcc45bea3..b1b01a7d6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBreaker.java @@ -21,26 +21,23 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiBreaker extends GuiWtfMojang { +public class GuiBreaker extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityBreaker breaker; public GuiBreaker(ContainerBreaker container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.breaker = container.breaker; this.imageWidth = 176; this.imageHeight = 93 + 86; } @Override - protected void renderLabels(MatrixStack matrices, int x, int y) { - AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.breaker); - } - - @Override - protected void renderBg(MatrixStack matrices, float partialTicks, int x, int y) { + protected void renderBg(@Nonnull MatrixStack matrices, float partialTicks, int x, int y) { RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); this.getMinecraft().getTextureManager().bind(AssetUtil.GUI_INVENTORY_LOCATION); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index 1e8ab1639..bce89d13d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -21,8 +21,10 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiCanolaPress extends GuiWtfMojang { +public class GuiCanolaPress extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_canola_press"); private final TileEntityCanolaPress press; @@ -30,7 +32,7 @@ public class GuiCanolaPress extends GuiWtfMojang { private FluidDisplay fluid; public GuiCanolaPress(ContainerCanolaPress container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.press = container.press; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -44,7 +46,7 @@ public class GuiCanolaPress extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); @@ -52,7 +54,7 @@ public class GuiCanolaPress extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.press); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 2f977dc53..06e3750cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -15,21 +15,25 @@ import com.mojang.blaze3d.systems.RenderSystem; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoalGenerator; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiCoalGenerator extends GuiWtfMojang { +public class GuiCoalGenerator extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coal_generator"); private final TileEntityCoalGenerator generator; private EnergyDisplay energy; public GuiCoalGenerator(ContainerCoalGenerator container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.generator = container.generator; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -39,17 +43,16 @@ public class GuiCoalGenerator extends GuiWtfMojang { public void init() { super.init(); this.energy = new EnergyDisplay(this.leftPos + 42, this.topPos + 5, this.generator.storage); + titleLabelX = (int) (imageWidth / 2.0f - font.width(title) / 2.0f); + titleLabelY = -10; } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { + renderBackground(matrices); super.render(matrices, x, y, f); this.energy.render(matrices, x, y); - } - - @Override - public void renderLabels(MatrixStack matrices, int x, int y) { - AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.generator); + renderTooltip(matrices, x, y); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index 3fb93045f..3b8252aa6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -23,8 +23,10 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiCoffeeMachine extends GuiWtfMojang { +public class GuiCoffeeMachine extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coffee_machine"); private final TileEntityCoffeeMachine machine; @@ -33,7 +35,7 @@ public class GuiCoffeeMachine extends GuiWtfMojang { private FluidDisplay fluid; public GuiCoffeeMachine(ContainerCoffeeMachine container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.machine = container.machine; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -51,7 +53,7 @@ public class GuiCoffeeMachine extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); String text2 = this.machine.coffeeCacheAmount + "/" + TileEntityCoffeeMachine.COFFEE_CACHE_MAX_AMOUNT + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.coffee"); @@ -64,7 +66,7 @@ public class GuiCoffeeMachine extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.machine); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index 7faedb471..2ab20e403 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -21,15 +21,17 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiDirectionalBreaker extends GuiWtfMojang { +public class GuiDirectionalBreaker extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_directional_breaker"); private final TileEntityLongRangeBreaker breaker; private EnergyDisplay energy; public GuiDirectionalBreaker(ContainerDirectionalBreaker container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.breaker = container.breaker; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -42,14 +44,14 @@ public class GuiDirectionalBreaker extends GuiWtfMojang { +public class GuiDrill extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_drill"); public GuiDrill(ContainerDrill container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.imageWidth = 176; this.imageHeight = 54 + 86; } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, StringUtil.localize("container." + ActuallyAdditions.MODID + ".drill.name")); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index b647a8e88..957715903 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -21,22 +21,24 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiDropper extends GuiWtfMojang { +public class GuiDropper extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityDropper dropper; public GuiDropper(ContainerDropper container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.dropper = container.dropper; this.imageWidth = 176; this.imageHeight = 93 + 86; } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.dropper); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index c8283aa65..4958c4937 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -21,15 +21,17 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiEnergizer extends GuiWtfMojang { +public class GuiEnergizer extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnergizer energizer; private EnergyDisplay energy; public GuiEnergizer(ContainerEnergizer container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.energizer = container.energizer; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -42,13 +44,13 @@ public class GuiEnergizer extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.energizer); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index e2f6a086f..a51077a19 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -21,16 +21,18 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiEnervator extends GuiWtfMojang { +public class GuiEnervator extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnervator enervator; private EnergyDisplay energy; public GuiEnervator(ContainerEnervator container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.enervator = container.enervator; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -43,13 +45,13 @@ public class GuiEnervator extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.enervator); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java index 052c0a409..3a5b9540e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java @@ -21,9 +21,11 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFarmer extends GuiWtfMojang { +public class GuiFarmer extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_farmer"); private final TileEntityFarmer farmer; @@ -31,7 +33,7 @@ public class GuiFarmer extends GuiWtfMojang { private EnergyDisplay energy; public GuiFarmer(ContainerFarmer container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.farmer = container.farmer; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -45,7 +47,7 @@ public class GuiFarmer extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.farmer); } @@ -63,7 +65,7 @@ public class GuiFarmer extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index 28d5504f4..00c920ee6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -23,21 +23,23 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFeeder extends GuiWtfMojang { +public class GuiFeeder extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_feeder"); public final TileEntityFeeder tileFeeder; public GuiFeeder(ContainerFeeder container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.tileFeeder = container.feeder; this.imageWidth = 176; this.imageHeight = 70 + 86; } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); if (x >= this.leftPos + 69 && y >= this.topPos + 30 && x <= this.leftPos + 69 + 10 && y <= this.topPos + 30 + 10) { String[] array = new String[]{this.tileFeeder.currentAnimalAmount + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.animals"), this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < TileEntityFeeder.THRESHOLD @@ -50,7 +52,7 @@ public class GuiFeeder extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tileFeeder); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index ad70ebca6..759be58be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -21,9 +21,11 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFermentingBarrel extends GuiWtfMojang { +public class GuiFermentingBarrel extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fermenting_barrel"); private final TileEntityFermentingBarrel press; @@ -31,14 +33,14 @@ public class GuiFermentingBarrel extends GuiWtfMojang private FluidDisplay output; public GuiFermentingBarrel(ContainerFermentingBarrel container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.press = container.barrel; this.imageWidth = 176; this.imageHeight = 93 + 86; } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.input.render(matrices, x, y); this.output.render(matrices, x, y); @@ -52,7 +54,7 @@ public class GuiFermentingBarrel extends GuiWtfMojang } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.press); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java index 079618614..92450cf29 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java @@ -22,19 +22,21 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFilter extends GuiWtfMojang { +public class GuiFilter extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_filter"); public GuiFilter(ContainerFilter container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.imageWidth = 176; this.imageHeight = 90 + 86; } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, StringUtil.localize("container." + ActuallyAdditions.MODID + ".filter.name")); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index 2e785d47f..06dbe3e25 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -21,23 +21,25 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFluidCollector extends GuiWtfMojang { +public class GuiFluidCollector extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fluid_collector"); private final TileEntityFluidCollector collector; private FluidDisplay fluid; public GuiFluidCollector(ContainerFluidCollector container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.collector = container.collector; this.imageWidth = 176; this.imageHeight = 93 + 86; } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.fluid.render(matrices, x, y); @@ -50,7 +52,7 @@ public class GuiFluidCollector extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.collector); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 2aeb098a6..be8b8d336 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -24,8 +24,10 @@ import net.minecraft.util.text.TextFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiFurnaceDouble extends GuiWtfMojang { +public class GuiFurnaceDouble extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_furnace_double"); private final TileEntityPoweredFurnace tileFurnace; @@ -34,14 +36,14 @@ public class GuiFurnaceDouble extends GuiWtfMojang { private Button buttonAutoSplit; public GuiFurnaceDouble(ContainerFurnaceDouble container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.tileFurnace = container.furnace; this.imageWidth = 176; this.imageHeight = 93 + 86; } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); @@ -79,7 +81,7 @@ public class GuiFurnaceDouble extends GuiWtfMojang { // } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.tileFurnace); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index ced1a1d20..daea6c9a5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -24,8 +24,10 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { +public class GuiLaserRelayItemWhitelist extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_laser_relay_item_whitelist"); private final TileEntityLaserRelayItemAdvanced tile; @@ -37,7 +39,7 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { +public class GuiMiner extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityVerticalDigger miner; public GuiMiner(ContainerMiner container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.miner = container.miner; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -50,7 +52,7 @@ public class GuiMiner extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.miner); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index da8d83cb9..ece370d90 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -23,9 +23,11 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiOilGenerator extends GuiWtfMojang { +public class GuiOilGenerator extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_oil_generator"); private final TileEntityOilGenerator generator; @@ -34,7 +36,7 @@ public class GuiOilGenerator extends GuiWtfMojang { private FluidDisplay fluid; public GuiOilGenerator(ContainerOilGenerator container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.generator = container.generator; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -48,14 +50,14 @@ public class GuiOilGenerator extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); this.energy.render(matrices, x, y); this.fluid.render(matrices, x, y); } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.generator); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index 739eea205..93f3ad322 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -21,14 +21,16 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiPhantomPlacer extends GuiWtfMojang { +public class GuiPhantomPlacer extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityPhantomPlacer placer; public GuiPhantomPlacer(ContainerPhantomPlacer container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.placer = container.placer; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -53,7 +55,7 @@ public class GuiPhantomPlacer extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { + public void render(@Nonnull MatrixStack matrices, int mouseX, int mouseY, float partialTicks) { super.render(matrices, mouseX, mouseY, partialTicks); // if (!this.placer.isBreaker && this.buttonList.get(0).isMouseOver()) { @@ -78,7 +80,7 @@ public class GuiPhantomPlacer extends GuiWtfMojang { // } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.placer); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 766c481f4..dc3c2babe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -21,9 +21,11 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiRangedCollector extends GuiWtfMojang { +public class GuiRangedCollector extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_ranged_collector"); private final TileEntityRangedCollector collector; @@ -31,7 +33,7 @@ public class GuiRangedCollector extends GuiWtfMojang { private FilterSettingsGui filter; public GuiRangedCollector(ContainerRangedCollector container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.collector = container.collector; this.imageWidth = 176; this.imageHeight = 86 + 86; @@ -45,7 +47,7 @@ public class GuiRangedCollector extends GuiWtfMojang { } @Override - public void render(MatrixStack matrices, int x, int y, float f) { + public void render(@Nonnull MatrixStack matrices, int x, int y, float f) { super.render(matrices, x, y, f); //this.filter.drawHover(matrices, x, y); @@ -59,7 +61,7 @@ public class GuiRangedCollector extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.collector); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index de84cb4b9..c1c0f85b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -22,15 +22,17 @@ import net.minecraft.util.text.ITextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import javax.annotation.Nonnull; + @OnlyIn(Dist.CLIENT) -public class GuiXPSolidifier extends GuiWtfMojang { +public class GuiXPSolidifier extends AAScreen { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_xp_solidifier"); private final TileEntityXPSolidifier solidifier; public GuiXPSolidifier(ContainerXPSolidifier container, PlayerInventory inventory, ITextComponent title) { - super(container, inventory); + super(container, inventory, title); this.solidifier = container.solidifier; this.imageWidth = 176; this.imageHeight = 93 + 86; @@ -71,7 +73,7 @@ public class GuiXPSolidifier extends GuiWtfMojang { } @Override - public void renderLabels(MatrixStack matrices, int x, int y) { + public void renderLabels(@Nonnull MatrixStack matrices, int x, int y) { AssetUtil.displayNameString(matrices, this.font, this.imageWidth, -10, this.solidifier); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index e09925598..a4e4b3f64 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -19,6 +19,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SUpdateTileEntityPacket; +import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; @@ -35,7 +36,7 @@ import net.minecraftforge.items.IItemHandler; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public abstract class TileEntityBase extends TileEntity implements ITickable { +public abstract class TileEntityBase extends TileEntity implements ITickableTileEntity { public boolean isRedstonePowered; public boolean isPulseMode; @@ -48,17 +49,6 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { super(type); } - private static void register(Class tileClass) { - // TODO: [port] migrate to register system. - // try { - // //This is hacky and dirty but it works so whatever - // ResourceLocation name = new ResourceLocation(ActuallyAdditions.MODID, tileClass.newInstance().name); - // GameRegistry.registerTileEntity(tileClass, name); - // } catch (Exception e) { - // ActuallyAdditions.LOGGER.fatal("Registering a TileEntity failed!", e); - // } - } - @Override public CompoundNBT save(CompoundNBT compound) { this.writeSyncableNBT(compound, NBTType.SAVE_TILE); @@ -271,7 +261,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable { } protected boolean sendUpdateWithInterval() { - if (this.ticksElapsed % ConfigIntValues.TILE_ENTITY_UPDATE_INTERVAL.getValue() == 0) { + if (this.ticksElapsed % 5 == 0) { //TODO was a config TILE_ENTITY_UPDATE_INTERVAL this.sendUpdate(); return true; } else { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java index 6fef3bcae..e1298bd15 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityCoalGenerator.java @@ -27,8 +27,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.ForgeHooks; @@ -72,6 +74,8 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements if (type != NBTType.SAVE_BLOCK) { compound.putInt("BurnTime", this.currentBurnTime); compound.putInt("MaxBurnTime", this.maxBurnTime); + if (currentRecipe != null) + compound.putString("currentRecipe", currentRecipe.getId().toString()); } this.storage.writeToNBT(compound); super.writeSyncableNBT(compound, type); @@ -82,6 +86,15 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements if (type != NBTType.SAVE_BLOCK) { this.currentBurnTime = compound.getInt("BurnTime"); this.maxBurnTime = compound.getInt("MaxBurnTime"); + if (compound.contains("currentRecipe")) { + ResourceLocation id = new ResourceLocation(compound.getString("currentRecipe")); + for (SolidFuelRecipe fuelRecipe : ActuallyAdditionsAPI.SOLID_FUEL_RECIPES) { + if (fuelRecipe.getId().equals(id)) { + this.currentRecipe = fuelRecipe; + break; + } + } + } } this.storage.readFromNBT(compound); super.readSyncableNBT(compound, type); @@ -137,7 +150,13 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements @Override public IAcceptor getAcceptor() { - return (slot, stack, automation) -> ForgeHooks.getBurnTime(stack) > 0; + return (slot, stack, automation) -> { + SingleItem singleItem = new SingleItem(stack); + for (SolidFuelRecipe recipe : ActuallyAdditionsAPI.SOLID_FUEL_RECIPES) { + if (recipe.matches(singleItem, null))return true; + } + return false; + }; } @Override @@ -177,7 +196,7 @@ public class TileEntityCoalGenerator extends TileEntityInventoryBase implements @Override public ITextComponent getDisplayName() { - return StringTextComponent.EMPTY; + return new TranslationTextComponent("container.actuallyadditions.coalGenerator"); } @Nullable diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index a013620ba..154276c70 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -4,9 +4,9 @@ "achievement.page.actuallyadditions": "Actually Additions", "actuallyadditions.lolWutHowUDoDis": "This is bugged. Throw it away. Please.", "tooltip.actuallyadditions.disabled": "Disabled Object", - "actuallyadditions.cft": "CF/t", - "actuallyadditions.cf": "CF", - "actuallyadditions.cflong": "Crystal Flux", + "actuallyadditions.fet": "FE/t", + "actuallyadditions.fe": "FE", + "actuallyadditions.felong": "Forge Energy", "misc.actuallyadditions.power_long": "%s/%s Crystal Flux", "misc.actuallyadditions.power_single": "%s Crystal Flux", "misc.actuallyadditions.power_single_short": "%s CF",