From 78cbf9a2acaee2c77a0c71784627a3b6f86eace3 Mon Sep 17 00:00:00 2001 From: Prospector Date: Wed, 31 Jul 2019 16:13:03 -0700 Subject: [PATCH 01/13] Dynamic bucket textures --- .../java/techreborn/TechRebornClient.java | 66 ++++--- .../render/DynamicBucketBakedModel.java | 162 ++++++++++++++++++ .../client/render/DynamicCellBakedModel.java | 46 +---- src/main/java/techreborn/init/ModFluids.java | 17 +- .../models/item/bucket_background.json | 6 + .../techreborn/models/item/bucket_base.json | 6 + .../techreborn/models/item/bucket_fluid.json | 6 + .../models/item/bucket_fluid_template.json | 59 +++++++ .../textures/item/bucket_background.png | Bin 0 -> 171 bytes .../techreborn/textures/item/bucket_base.png | Bin 0 -> 335 bytes 10 files changed, 295 insertions(+), 73 deletions(-) create mode 100644 src/main/java/techreborn/client/render/DynamicBucketBakedModel.java create mode 100644 src/main/resources/assets/techreborn/models/item/bucket_background.json create mode 100644 src/main/resources/assets/techreborn/models/item/bucket_base.json create mode 100644 src/main/resources/assets/techreborn/models/item/bucket_fluid.json create mode 100644 src/main/resources/assets/techreborn/models/item/bucket_fluid_template.json create mode 100644 src/main/resources/assets/techreborn/textures/item/bucket_background.png create mode 100644 src/main/resources/assets/techreborn/textures/item/bucket_base.png diff --git a/src/main/java/techreborn/TechRebornClient.java b/src/main/java/techreborn/TechRebornClient.java index 959eaac44..ade377127 100644 --- a/src/main/java/techreborn/TechRebornClient.java +++ b/src/main/java/techreborn/TechRebornClient.java @@ -32,10 +32,14 @@ import net.minecraft.client.render.model.ModelLoader; import net.minecraft.client.render.model.UnbakedModel; import net.minecraft.client.texture.Sprite; import net.minecraft.client.util.ModelIdentifier; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; import reborncore.client.gui.builder.GuiBase; import reborncore.client.hud.StackInfoHUD; +import techreborn.client.render.DynamicBucketBakedModel; import techreborn.client.render.DynamicCellBakedModel; import techreborn.events.StackToolTipHandler; import techreborn.init.TRContent; @@ -43,7 +47,6 @@ import techreborn.items.ItemDynamicCell; import techreborn.items.ItemFrequencyTransmitter; import techreborn.utils.StackWIPHandler; -import javax.annotation.Nullable; import java.util.Collection; import java.util.Collections; import java.util.Set; @@ -58,32 +61,53 @@ public class TechRebornClient implements ClientModInitializer { out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_fluid"), "inventory")); out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_background"), "inventory")); out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_glass"), "inventory")); + + out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_base"), "inventory")); + out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_fluid"), "inventory")); + out.accept(new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_background"), "inventory")); }); ModelLoadingRegistry.INSTANCE.registerVariantProvider(resourceManager -> (modelIdentifier, modelProviderContext) -> { - if (!modelIdentifier.getNamespace().equals("techreborn")) { - return null; - } - if (!modelIdentifier.getPath().equals("cell")) { - return null; - } - return new UnbakedModel() { - @Override - public Collection getModelDependencies() { - return Collections.emptyList(); - } + if (modelIdentifier.getNamespace().equals(TechReborn.MOD_ID)) { + if (modelIdentifier.getPath().equals("cell")) { + return new UnbakedModel() { + @Override + public Collection getModelDependencies() { + return Collections.emptyList(); + } - @Override - public Collection getTextureDependencies(Function function, Set set) { - return Collections.emptyList(); - } + @Override + public Collection getTextureDependencies(Function function, Set set) { + return Collections.emptyList(); + } - @Nullable - @Override - public BakedModel bake(ModelLoader modelLoader, Function function, ModelBakeSettings modelBakeSettings) { - return new DynamicCellBakedModel(); + @Override + public BakedModel bake(ModelLoader modelLoader, Function function, ModelBakeSettings modelBakeSettings) { + return new DynamicCellBakedModel(); + } + }; } - }; + Fluid fluid = Registry.FLUID.get(new Identifier(TechReborn.MOD_ID, modelIdentifier.getPath().split("_bucket")[0])); + if (modelIdentifier.getPath().endsWith("_bucket") && fluid != Fluids.EMPTY) { + return new UnbakedModel() { + @Override + public Collection getModelDependencies() { + return Collections.emptyList(); + } + + @Override + public Collection getTextureDependencies(Function function, Set set) { + return Collections.emptyList(); + } + + @Override + public BakedModel bake(ModelLoader modelLoader, Function function, ModelBakeSettings modelBakeSettings) { + return new DynamicBucketBakedModel(fluid); + } + }; + } + } + return null; }); StackToolTipHandler.setup(); diff --git a/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java new file mode 100644 index 000000000..1183675df --- /dev/null +++ b/src/main/java/techreborn/client/render/DynamicBucketBakedModel.java @@ -0,0 +1,162 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +package techreborn.client.render; + +import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler; +import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; +import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; +import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; +import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; +import net.fabricmc.fabric.api.renderer.v1.render.RenderContext; +import net.fabricmc.indigo.renderer.helper.GeometryHelper; +import net.minecraft.block.BlockState; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.model.BakedModel; +import net.minecraft.client.render.model.BakedModelManager; +import net.minecraft.client.render.model.BakedQuad; +import net.minecraft.client.render.model.json.ModelItemPropertyOverrideList; +import net.minecraft.client.render.model.json.ModelTransformation; +import net.minecraft.client.texture.Sprite; +import net.minecraft.client.util.ModelIdentifier; +import net.minecraft.entity.LivingEntity; +import net.minecraft.fluid.Fluid; +import net.minecraft.fluid.Fluids; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Identifier; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.ExtendedBlockView; +import net.minecraft.world.World; +import reborncore.common.fluid.container.ItemFluidInfo; +import techreborn.TechReborn; + +import javax.annotation.Nullable; +import java.awt.*; +import java.util.Collections; +import java.util.List; +import java.util.Random; +import java.util.function.Supplier; + +public class DynamicBucketBakedModel implements BakedModel, FabricBakedModel { + + private final Fluid fluid; + + private static final ModelIdentifier BUCKET_BASE = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_base"), "inventory"); + private static final ModelIdentifier BUCKET_BACKGROUND = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_background"), "inventory"); + private static final ModelIdentifier BUCKET_FLUID = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "bucket_fluid"), "inventory"); + + public DynamicBucketBakedModel(Fluid fluid) { + this.fluid = fluid; + } + + @Override + public void emitBlockQuads(ExtendedBlockView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { + + } + + @Override + public void emitItemQuads(ItemStack stack, Supplier randomSupplier, RenderContext context) { + Fluid fluid = Fluids.EMPTY; + if (stack.getItem() instanceof ItemFluidInfo) { + ItemFluidInfo fluidInfo = (ItemFluidInfo) stack.getItem(); + fluid = fluidInfo.getFluid(stack); + + } + BakedModelManager bakedModelManager = MinecraftClient.getInstance().getBakedModelManager(); + context.fallbackConsumer().accept(bakedModelManager.getModel(BUCKET_BASE)); + context.fallbackConsumer().accept(bakedModelManager.getModel(BUCKET_BACKGROUND)); + + if (fluid != Fluids.EMPTY) { + FluidRenderHandler fluidRenderHandler = FluidRenderHandlerRegistry.INSTANCE.get(fluid); + BakedModel fluidModel = bakedModelManager.getModel(BUCKET_FLUID); + int fluidColor = fluidRenderHandler.getFluidColor(MinecraftClient.getInstance().world, MinecraftClient.getInstance().player.getBlockPos(), fluid.getDefaultState()); + Sprite fluidSprite = fluidRenderHandler.getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0]; + int color = new Color((float) (fluidColor >> 16 & 255) / 255.0F, (float) (fluidColor >> 8 & 255) / 255.0F, (float) (fluidColor & 255) / 255.0F).getRGB(); + context.pushTransform(quad -> { + quad.nominalFace(GeometryHelper.lightFace(quad)); + quad.spriteColor(0, color, color, color, color); + quad.spriteBake(0, fluidSprite, MutableQuadView.BAKE_LOCK_UV); + return true; + }); + final QuadEmitter emitter = context.getEmitter(); + fluidModel.getQuads(null, null, randomSupplier.get()).forEach(q -> { + emitter.fromVanilla(q.getVertexData(), 0, false); + emitter.emit(); + }); + context.popTransform(); + } + } + + @Override + public List getQuads(@Nullable BlockState blockState, @Nullable Direction direction, Random random) { + return Collections.emptyList(); + } + + @Override + public boolean isVanillaAdapter() { + return false; + } + + @Override + public boolean useAmbientOcclusion() { + return true; + } + + @Override + public boolean hasDepthInGui() { + return false; + } + + @Override + public boolean isBuiltin() { + return false; + } + + @Override + public Sprite getSprite() { + return MinecraftClient.getInstance().getSpriteAtlas().getSprite(new Identifier("minecraft:item/bucket")); + } + + @Override + public ModelTransformation getTransformation() { + return ModelHelper.DEFAULT_ITEM_TRANSFORMS; + } + + protected class ItemProxy extends ModelItemPropertyOverrideList { + public ItemProxy() { + super(null, null, null, Collections.emptyList()); + } + + @Override + public BakedModel apply(BakedModel bakedModel, ItemStack itemStack, World world, LivingEntity livingEntity) { + return DynamicBucketBakedModel.this; + } + } + + @Override + public ModelItemPropertyOverrideList getItemPropertyOverrides() { + return new ItemProxy(); + } +} diff --git a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java index b66235fa0..8b9bd2617 100644 --- a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java @@ -26,11 +26,6 @@ package techreborn.client.render; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandler; import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; -import net.fabricmc.fabric.api.renderer.v1.Renderer; -import net.fabricmc.fabric.api.renderer.v1.RendererAccess; -import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial; -import net.fabricmc.fabric.api.renderer.v1.mesh.Mesh; -import net.fabricmc.fabric.api.renderer.v1.mesh.MeshBuilder; import net.fabricmc.fabric.api.renderer.v1.mesh.MutableQuadView; import net.fabricmc.fabric.api.renderer.v1.mesh.QuadEmitter; import net.fabricmc.fabric.api.renderer.v1.model.FabricBakedModel; @@ -66,17 +61,11 @@ import java.util.function.Supplier; public class DynamicCellBakedModel implements BakedModel, FabricBakedModel { - private final Sprite base; - private static final ModelIdentifier CELL_BASE = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_base"), "inventory"); private static final ModelIdentifier CELL_BACKGROUND = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_background"), "inventory"); private static final ModelIdentifier CELL_FLUID = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_fluid"), "inventory"); private static final ModelIdentifier CELL_GLASS = new ModelIdentifier(new Identifier(TechReborn.MOD_ID, "cell_glass"), "inventory"); - public DynamicCellBakedModel() { - base = MinecraftClient.getInstance().getSpriteAtlas().getSprite(new Identifier("techreborn:item/cell_base")); - } - @Override public void emitBlockQuads(ExtendedBlockView blockView, BlockState state, BlockPos pos, Supplier randomSupplier, RenderContext context) { @@ -122,39 +111,6 @@ public class DynamicCellBakedModel implements BakedModel, FabricBakedModel { return Collections.emptyList(); } - //I have no idea what im doing, this works good enough for me, if you want to make it nicer a PR or tips would be appreciated, thanks. - private Mesh getMesh(Fluid fluid) { - Renderer renderer = RendererAccess.INSTANCE.getRenderer(); - MeshBuilder builder = renderer.meshBuilder(); - QuadEmitter emitter = builder.getEmitter(); - - RenderMaterial mat = renderer.materialFinder().disableDiffuse(0, true).find(); - - //TODO make the base texture 3d somehow - emitter.square(Direction.SOUTH, 0, 0, 1, 1, 0) - .material(mat) - .spriteColor(0, -1, -1, -1, -1) - .spriteBake(0, base, MutableQuadView.BAKE_LOCK_UV).emit(); - - if (fluid != Fluids.EMPTY) { - FluidRenderHandler fluidRenderHandler = FluidRenderHandlerRegistry.INSTANCE.get(fluid); - if (fluidRenderHandler != null) { - int color = fluidRenderHandler.getFluidColor(MinecraftClient.getInstance().world, MinecraftClient.getInstance().player.getBlockPos(), fluid.getDefaultState()); - //Does maths that works - color = new Color((float) (color >> 16 & 255) / 255.0F, (float) (color >> 8 & 255) / 255.0F, (float) (color & 255) / 255.0F).getRGB(); - - Sprite fluidSprite = fluidRenderHandler.getFluidSprites(MinecraftClient.getInstance().world, BlockPos.ORIGIN, fluid.getDefaultState())[0]; - emitter.square(Direction.SOUTH, 0.4F, 0.25F, 0.6F, 0.75F, -0.0001F) - .material(mat) - .spriteColor(0, color, color, color, color) - .spriteBake(0, fluidSprite, MutableQuadView.BAKE_LOCK_UV).emit(); - } - } - - return builder.build(); - } - - @Override public boolean isVanillaAdapter() { return false; @@ -177,7 +133,7 @@ public class DynamicCellBakedModel implements BakedModel, FabricBakedModel { @Override public Sprite getSprite() { - return base; + return MinecraftClient.getInstance().getSpriteAtlas().getSprite(new Identifier("techreborn:item/cell_base")); } @Override diff --git a/src/main/java/techreborn/init/ModFluids.java b/src/main/java/techreborn/init/ModFluids.java index 142a96c53..83696d45f 100644 --- a/src/main/java/techreborn/init/ModFluids.java +++ b/src/main/java/techreborn/init/ModFluids.java @@ -27,6 +27,7 @@ package techreborn.init; import net.fabricmc.fabric.api.block.FabricBlockSettings; import net.minecraft.block.Material; import net.minecraft.item.Item; +import net.minecraft.item.Items; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; import reborncore.common.fluid.*; @@ -76,28 +77,30 @@ public enum ModFluids { private final Identifier identifier; ModFluids() { - this.identifier = new Identifier("techreborn", this.name().replace("_", "").toLowerCase()); + this.identifier = new Identifier(TechReborn.MOD_ID, this.name().replace("_", "").toLowerCase()); FluidSettings fluidSettings = FluidSettings.create(); - Identifier texture = new Identifier("techreborn", "block/fluids/" + this.name().replace("_", "").toLowerCase() + "_flowing"); + Identifier texture = new Identifier(TechReborn.MOD_ID, "block/fluids/" + this.name().replace("_", "").toLowerCase() + "_flowing"); fluidSettings.setStillTexture(texture); fluidSettings.setFlowingTexture(texture); - stillFluid = new RebornFluid(true, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid){}; - flowingFluid = new RebornFluid(false, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid){}; + stillFluid = new RebornFluid(true, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid) { + }; + flowingFluid = new RebornFluid(false, fluidSettings, () -> block, () -> bucket, () -> flowingFluid, () -> stillFluid) { + }; block = new RebornFluidBlock(stillFluid, FabricBlockSettings.of(Material.WATER).noCollision().hardness(100.0F).dropsNothing().build()); - bucket = new RebornBucketItem(stillFluid, new Item.Settings().group(TechReborn.ITEMGROUP)); + bucket = new RebornBucketItem(stillFluid, new Item.Settings().group(TechReborn.ITEMGROUP).recipeRemainder(Items.BUCKET).maxCount(1)); } public void register() { RebornFluidManager.register(stillFluid, identifier); - RebornFluidManager.register(flowingFluid, new Identifier("techreborn", identifier.getPath() + "_flowing")); + RebornFluidManager.register(flowingFluid, new Identifier(TechReborn.MOD_ID, identifier.getPath() + "_flowing")); Registry.register(Registry.BLOCK, identifier, block); - Registry.register(Registry.ITEM, identifier, bucket); + Registry.register(Registry.ITEM, new Identifier(TechReborn.MOD_ID, identifier.getPath() + "_bucket"), bucket); } public RebornFluid getFluid() { diff --git a/src/main/resources/assets/techreborn/models/item/bucket_background.json b/src/main/resources/assets/techreborn/models/item/bucket_background.json new file mode 100644 index 000000000..eb22f240a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bucket_background.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/bucket_fluid_template", + "textures": { + "texture": "techreborn:item/bucket_background" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bucket_base.json b/src/main/resources/assets/techreborn/models/item/bucket_base.json new file mode 100644 index 000000000..aa25e282f --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bucket_base.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "techreborn:item/bucket_base" + } +} diff --git a/src/main/resources/assets/techreborn/models/item/bucket_fluid.json b/src/main/resources/assets/techreborn/models/item/bucket_fluid.json new file mode 100644 index 000000000..eb22f240a --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bucket_fluid.json @@ -0,0 +1,6 @@ +{ + "parent": "techreborn:item/bucket_fluid_template", + "textures": { + "texture": "techreborn:item/bucket_background" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/models/item/bucket_fluid_template.json b/src/main/resources/assets/techreborn/models/item/bucket_fluid_template.json new file mode 100644 index 000000000..0f84d0e4e --- /dev/null +++ b/src/main/resources/assets/techreborn/models/item/bucket_fluid_template.json @@ -0,0 +1,59 @@ +{ + "elements": [ + { + "from": [4, 11, 7.5], + "to": [12, 13, 8.5], + "faces": { + "north": {"uv": [4, 3, 12, 5], "texture": "#texture"}, + "south": {"uv": [4, 3, 12, 5], "texture": "#texture"} + } + }, + { + "from": [5, 10, 7.5], + "to": [11, 11, 8.5], + "faces": { + "north": {"uv": [5, 5, 11, 6], "texture": "#texture"}, + "south": {"uv": [5, 5, 11, 6], "texture": "#texture"} + } + }, + { + "from": [3, 11, 7.5], + "to": [4, 12, 8.5], + "faces": { + "north": {"uv": [12, 4, 13, 5], "texture": "#texture"}, + "south": {"uv": [12, 4, 13, 5], "texture": "#texture"} + } + }, + { + "from": [12, 11, 7.5], + "to": [13, 12, 8.5], + "rotation": {"angle": 0, "axis": "y", "origin": [17, 8, 8]}, + "faces": { + "north": {"uv": [3, 4, 4, 5], "texture": "#texture"}, + "south": {"uv": [3, 4, 4, 5], "texture": "#texture"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 3, 1], + "scale": [0.55, 0.55, 0.55] + }, + "firstperson_righthand": { + "rotation": [0, -90, 25], + "translation": [1.13, 3.2, 1.13], + "scale": [0.68, 0.68, 0.68] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "head": { + "rotation": [0, 180, 0], + "translation": [0, 13, 7] + }, + "fixed": { + "rotation": [0, 180, 0] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/techreborn/textures/item/bucket_background.png b/src/main/resources/assets/techreborn/textures/item/bucket_background.png new file mode 100644 index 0000000000000000000000000000000000000000..b1965eead38b5c4bbf797e0a1691578f4eb7a2fd GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`MV>B>Ar`%F`!@0(Rp4=Xza&2J z5L1VyWaHY1COI(!*{@4GgeLNSTDs@lr@NaQ_qYEJ@M2_`DS4v!>0bM0m86~*dySvh zl-KP(aAwQ3U8m1kPH0i_I3&Sb?Dw`^zUi72qry@Z&*>tHEFMm4zkd99{CKqm1H(g| Vz=NLzrUGqe@O1TaS?83{1OW7qLVf@M literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/techreborn/textures/item/bucket_base.png b/src/main/resources/assets/techreborn/textures/item/bucket_base.png new file mode 100644 index 0000000000000000000000000000000000000000..ca6d0e3113d623a53d1ecbe408be3adda9972ee8 GIT binary patch literal 335 zcmV-V0kHmwP)U5JlgtwhuQzP~{jYAt$3tNvgmp;xcDQ1ym?EK)JwAv5RE`yD9P|3(K1Sm_M@N zL)pBMU}o%gyKR6Zx~^N9!ut`%Spfj<_xsAcY literal 0 HcmV?d00001 From e7adce612e4f1e7b380ceac7c909e62a2f0279df Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 03:22:14 +0300 Subject: [PATCH 02/13] Make TR armor repairable --- .../java/techreborn/events/ModRegistry.java | 72 +++++++++---------- .../java/techreborn/init/TRArmorMaterial.java | 2 +- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index 9117fb189..6ad52912a 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -126,49 +126,49 @@ public class ModRegistry { // Gem armor & tools if (ConfigTechReborn.enableGemArmorAndTools) { //Todo: repair with tags - RebornRegistry.registerItem(TRContent.BRONZE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE, "ingotBronze"), "bronze_sword")); - RebornRegistry.registerItem(TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.BRONZE, "ingotBronze"), "bronze_pickaxe")); - RebornRegistry.registerItem(TRContent.BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.BRONZE, "ingotBronze"), "bronze_spade")); - RebornRegistry.registerItem(TRContent.BRONZE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.BRONZE, "ingotBronze"), "bronze_axe")); - RebornRegistry.registerItem(TRContent.BRONZE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.BRONZE, "ingotBronze"), "bronze_hoe")); + RebornRegistry.registerItem(TRContent.BRONZE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.BRONZE), "bronze_sword")); + RebornRegistry.registerItem(TRContent.BRONZE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.BRONZE), "bronze_pickaxe")); + RebornRegistry.registerItem(TRContent.BRONZE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.BRONZE), "bronze_spade")); + RebornRegistry.registerItem(TRContent.BRONZE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.BRONZE), "bronze_axe")); + RebornRegistry.registerItem(TRContent.BRONZE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.BRONZE), "bronze_hoe")); - RebornRegistry.registerItem(TRContent.BRONZE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.HEAD, "ingotBronze"), "bronze_helmet")); - RebornRegistry.registerItem(TRContent.BRONZE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.CHEST, "ingotBronze"), "bronze_chestplate")); - RebornRegistry.registerItem(TRContent.BRONZE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.LEGS, "ingotBronze"), "bronze_leggings")); - RebornRegistry.registerItem(TRContent.BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.FEET, "ingotBronze"), "bronze_boots")); + RebornRegistry.registerItem(TRContent.BRONZE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.HEAD), "bronze_helmet")); + RebornRegistry.registerItem(TRContent.BRONZE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.CHEST), "bronze_chestplate")); + RebornRegistry.registerItem(TRContent.BRONZE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.LEGS), "bronze_leggings")); + RebornRegistry.registerItem(TRContent.BRONZE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.BRONZE, EquipmentSlot.FEET), "bronze_boots")); - RebornRegistry.registerItem(TRContent.RUBY_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY, "gemRuby"), "ruby_sword")); - RebornRegistry.registerItem(TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.RUBY, "gemRuby"), "ruby_pickaxe")); - RebornRegistry.registerItem(TRContent.RUBY_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.RUBY, "gemRuby"), "ruby_spade")); - RebornRegistry.registerItem(TRContent.RUBY_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.RUBY, "gemRuby"), "ruby_axe")); - RebornRegistry.registerItem(TRContent.RUBY_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.RUBY, "gemRuby"), "ruby_hoe")); + RebornRegistry.registerItem(TRContent.RUBY_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.RUBY), "ruby_sword")); + RebornRegistry.registerItem(TRContent.RUBY_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.RUBY), "ruby_pickaxe")); + RebornRegistry.registerItem(TRContent.RUBY_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.RUBY), "ruby_spade")); + RebornRegistry.registerItem(TRContent.RUBY_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.RUBY), "ruby_axe")); + RebornRegistry.registerItem(TRContent.RUBY_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.RUBY), "ruby_hoe")); - RebornRegistry.registerItem(TRContent.RUBY_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.HEAD, "gemRuby"), "ruby_helmet")); - RebornRegistry.registerItem(TRContent.RUBY_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.CHEST, "gemRuby"), "ruby_chestplate")); - RebornRegistry.registerItem(TRContent.RUBY_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.LEGS, "gemRuby"), "ruby_leggings")); - RebornRegistry.registerItem(TRContent.RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.FEET, "gemRuby"), "ruby_boots")); + RebornRegistry.registerItem(TRContent.RUBY_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.HEAD), "ruby_helmet")); + RebornRegistry.registerItem(TRContent.RUBY_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.CHEST), "ruby_chestplate")); + RebornRegistry.registerItem(TRContent.RUBY_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.LEGS), "ruby_leggings")); + RebornRegistry.registerItem(TRContent.RUBY_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.RUBY, EquipmentSlot.FEET), "ruby_boots")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_sword")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_pickaxe")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_spade")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_axe")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.SAPPHIRE, "gemSapphire"), "sapphire_hoe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.SAPPHIRE), "sapphire_sword")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.SAPPHIRE), "sapphire_pickaxe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.SAPPHIRE), "sapphire_spade")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.SAPPHIRE), "sapphire_axe")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.SAPPHIRE), "sapphire_hoe")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.HEAD, "gemSapphire"), "sapphire_helmet")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.CHEST, "gemSapphire"), "sapphire_chestplate")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.LEGS, "gemSapphire"), "sapphire_leggings")); - RebornRegistry.registerItem(TRContent.SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.FEET, "gemSapphire"), "sapphire_boots")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.HEAD), "sapphire_helmet")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.CHEST), "sapphire_chestplate")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.LEGS), "sapphire_leggings")); + RebornRegistry.registerItem(TRContent.SAPPHIRE_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.SAPPHIRE, EquipmentSlot.FEET), "sapphire_boots")); - RebornRegistry.registerItem(TRContent.PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT, "gemPeridot"), "peridot_sword")); - RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_pickaxe")); - RebornRegistry.registerItem(TRContent.PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.PERIDOT, "gemPeridot"), "peridot_spade")); - RebornRegistry.registerItem(TRContent.PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_axe")); - RebornRegistry.registerItem(TRContent.PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.PERIDOT, "gemPeridot"), "peridot_hoe")); + RebornRegistry.registerItem(TRContent.PERIDOT_SWORD = InitUtils.setup(new ItemTRSword(TRToolTier.PERIDOT), "peridot_sword")); + RebornRegistry.registerItem(TRContent.PERIDOT_PICKAXE = InitUtils.setup(new ItemTRPickaxe(TRToolTier.PERIDOT), "peridot_pickaxe")); + RebornRegistry.registerItem(TRContent.PERIDOT_SPADE = InitUtils.setup(new ItemTRSpade(TRToolTier.PERIDOT), "peridot_spade")); + RebornRegistry.registerItem(TRContent.PERIDOT_AXE = InitUtils.setup(new ItemTRAxe(TRToolTier.PERIDOT), "peridot_axe")); + RebornRegistry.registerItem(TRContent.PERIDOT_HOE = InitUtils.setup(new ItemTRHoe(TRToolTier.PERIDOT), "peridot_hoe")); - RebornRegistry.registerItem(TRContent.PERIDOT_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.HEAD, "gemPeridot"), "peridot_helmet")); - RebornRegistry.registerItem(TRContent.PERIDOT_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.CHEST, "gemPeridot"), "peridot_chestplate")); - RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.LEGS, "gemPeridot"), "peridot_leggings")); - RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.FEET, "gemPeridot"), "peridot_boots")); + RebornRegistry.registerItem(TRContent.PERIDOT_HELMET = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.HEAD), "peridot_helmet")); + RebornRegistry.registerItem(TRContent.PERIDOT_CHESTPLATE = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.CHEST), "peridot_chestplate")); + RebornRegistry.registerItem(TRContent.PERIDOT_LEGGINGS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.LEGS), "peridot_leggings")); + RebornRegistry.registerItem(TRContent.PERIDOT_BOOTS = InitUtils.setup(new ItemTRArmour(TRArmorMaterial.PERIDOT, EquipmentSlot.FEET), "peridot_boots")); } // Battery diff --git a/src/main/java/techreborn/init/TRArmorMaterial.java b/src/main/java/techreborn/init/TRArmorMaterial.java index 5d23dcb66..472921392 100644 --- a/src/main/java/techreborn/init/TRArmorMaterial.java +++ b/src/main/java/techreborn/init/TRArmorMaterial.java @@ -99,7 +99,7 @@ public enum TRArmorMaterial implements ArmorMaterial { @Override public String getName() { - return TechReborn.MOD_ID + ":" + this.toString().toLowerCase(); + return this.toString().toLowerCase(); } @Override From d53779f2c9caf012307f0baa38fd9e7da7a8e5ee Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 03:38:55 +0300 Subject: [PATCH 03/13] Light cleanup --- .../java/techreborn/events/ModRegistry.java | 8 ++-- src/main/java/techreborn/init/ModLoot.java | 44 ++++++------------- src/main/java/techreborn/init/ModSounds.java | 7 ++- .../java/techreborn/init/TRArmorMaterial.java | 10 ++--- .../java/techreborn/init/TRBlockEntities.java | 2 +- src/main/java/techreborn/init/TRToolTier.java | 2 +- 6 files changed, 28 insertions(+), 45 deletions(-) diff --git a/src/main/java/techreborn/events/ModRegistry.java b/src/main/java/techreborn/events/ModRegistry.java index 6ad52912a..c84462434 100644 --- a/src/main/java/techreborn/events/ModRegistry.java +++ b/src/main/java/techreborn/events/ModRegistry.java @@ -86,7 +86,7 @@ public class ModRegistry { registerSounds(); } - public static void registerBlocks() { + private static void registerBlocks() { Settings itemGroup = new Item.Settings().group(TechReborn.ITEMGROUP); Arrays.stream(Ores.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup)); Arrays.stream(StorageBlocks.values()).forEach(value -> RebornRegistry.registerBlock(value.block, itemGroup)); @@ -113,7 +113,7 @@ public class ModRegistry { TechReborn.LOGGER.debug("TechReborns Blocks Loaded"); } - public static void registerItems() { + private static void registerItems() { Arrays.stream(Ingots.values()).forEach(value -> RebornRegistry.registerItem(value.item)); Arrays.stream(Nuggets.values()).forEach(value -> RebornRegistry.registerItem(value.item)); Arrays.stream(Gems.values()).forEach(value -> RebornRegistry.registerItem(value.item)); @@ -213,11 +213,11 @@ public class ModRegistry { TechReborn.LOGGER.debug("TechReborns Items Loaded"); } - public static void registerFluids() { + private static void registerFluids() { Arrays.stream(ModFluids.values()).forEach(ModFluids::register); } - public static void registerSounds() { + private static void registerSounds() { ModSounds.ALARM = InitUtils.setup("alarm"); ModSounds.ALARM_2 = InitUtils.setup("alarm_2"); ModSounds.ALARM_3 = InitUtils.setup("alarm_3"); diff --git a/src/main/java/techreborn/init/ModLoot.java b/src/main/java/techreborn/init/ModLoot.java index afc4de215..a06a9d1f9 100644 --- a/src/main/java/techreborn/init/ModLoot.java +++ b/src/main/java/techreborn/init/ModLoot.java @@ -95,39 +95,21 @@ public class ModLoot { if (ConfigTechReborn.enableOverworldLoot) { switch (stringId) { case "minecraft:chests/abandoned_mineshaft": - supplier.withPool(poolBasic); + case "minecraft:chests/desert_pyramid": + case "minecraft:chests/igloo_chest": + case "minecraft:chests/jungle_temple": + case "minecraft:chests/simple_dungeon": + case "minecraft:chests/village/village_weaponsmith": + case "minecraft:chests/village/village_armorer": + case "minecraft:chests/village/village_toolsmith": + supplier.withPool(poolBasic); break; - case "minecraft:chests/desert_pyramid": - supplier.withPool(poolBasic); + case "minecraft:chests/stronghold_corridor": + case "minecraft:chests/stronghold_crossing": + case "minecraft:chests/stronghold_library": + supplier.withPool(poolAdvanced); break; - case "minecraft:chests/igloo_chest": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/jungle_temple": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/simple_dungeon": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/village/village_weaponsmith": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/village/village_armorer": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/village/village_toolsmith": - supplier.withPool(poolBasic); - break; - case "minecraft:chests/stronghold_corridor": - supplier.withPool(poolAdvanced); - break; - case "minecraft:chests/stronghold_crossing": - supplier.withPool(poolAdvanced); - break; - case "minecraft:chests/stronghold_library": - supplier.withPool(poolAdvanced); - break; - case "minecraft:chests/woodland_mansion": + case "minecraft:chests/woodland_mansion": supplier.withPool(poolIndustrial); break; } diff --git a/src/main/java/techreborn/init/ModSounds.java b/src/main/java/techreborn/init/ModSounds.java index 5b89f8c0b..d9f445740 100644 --- a/src/main/java/techreborn/init/ModSounds.java +++ b/src/main/java/techreborn/init/ModSounds.java @@ -27,6 +27,7 @@ package techreborn.init; import net.minecraft.block.entity.BlockEntity; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvent; +import net.minecraft.world.World; import reborncore.common.recipes.ICrafterSoundHanlder; /** @@ -48,7 +49,11 @@ public class ModSounds { @Override public void playSound(boolean firstRun, BlockEntity blockEntity) { - blockEntity.getWorld().playSound(null, blockEntity.getPos().getX(), blockEntity.getPos().getY(), + World world = blockEntity.getWorld(); + if (world == null){ + return; + } + world.playSound(null, blockEntity.getPos().getX(), blockEntity.getPos().getY(), blockEntity.getPos().getZ(), ModSounds.MACHINE_RUN, SoundCategory.BLOCKS, 0.1F, 1F); } } diff --git a/src/main/java/techreborn/init/TRArmorMaterial.java b/src/main/java/techreborn/init/TRArmorMaterial.java index 472921392..84ef4fb1d 100644 --- a/src/main/java/techreborn/init/TRArmorMaterial.java +++ b/src/main/java/techreborn/init/TRArmorMaterial.java @@ -30,7 +30,6 @@ import net.minecraft.recipe.Ingredient; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; import net.minecraft.util.Lazy; -import techreborn.TechReborn; import java.util.function.Supplier; @@ -59,8 +58,8 @@ public enum TRArmorMaterial implements ArmorMaterial { private final float toughness; private final Lazy repairMaterial; - private TRArmorMaterial(int maxDamageFactor, int[] damageReductionAmountArray, int enchantability, - SoundEvent soundEvent, float toughness, Supplier repairMaterialIn) { + TRArmorMaterial(int maxDamageFactor, int[] damageReductionAmountArray, int enchantability, + SoundEvent soundEvent, float toughness, Supplier repairMaterialIn) { this.maxDamageFactor = maxDamageFactor; this.damageReductionAmountArray = damageReductionAmountArray; this.enchantability = enchantability; @@ -91,10 +90,7 @@ public enum TRArmorMaterial implements ArmorMaterial { @Override public Ingredient getRepairIngredient() { - if (repairMaterial != null) { - return repairMaterial.get(); - } - return null; + return repairMaterial.get(); } @Override diff --git a/src/main/java/techreborn/init/TRBlockEntities.java b/src/main/java/techreborn/init/TRBlockEntities.java index 5cf33081d..802e626aa 100644 --- a/src/main/java/techreborn/init/TRBlockEntities.java +++ b/src/main/java/techreborn/init/TRBlockEntities.java @@ -65,7 +65,7 @@ import java.util.List; public class TRBlockEntities { - public static List> TYPES = new ArrayList<>(); + private static List> TYPES = new ArrayList<>(); public static final BlockEntityType THERMAL_GEN = register(ThermalGeneratorBlockEntity.class, "thermal_generator", TRContent.Machine.THERMAL_GENERATOR); public static final BlockEntityType QUANTUM_TANK = register(QuantumTankBlockEntity.class, "quantum_tank", TRContent.Machine.QUANTUM_TANK); diff --git a/src/main/java/techreborn/init/TRToolTier.java b/src/main/java/techreborn/init/TRToolTier.java index fb920526c..cad0ed85c 100644 --- a/src/main/java/techreborn/init/TRToolTier.java +++ b/src/main/java/techreborn/init/TRToolTier.java @@ -63,7 +63,7 @@ public enum TRToolTier implements ToolMaterial { private final int enchantability; private final Lazy repairMaterial; - private TRToolTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, + TRToolTier(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) { this.harvestLevel = harvestLevelIn; this.maxUses = maxUsesIn; From 8221be0800380846beee0133a799800bd945476e Mon Sep 17 00:00:00 2001 From: Prospector Date: Wed, 31 Jul 2019 21:38:47 -0700 Subject: [PATCH 04/13] Match sizing to cells --- .../textures/gui/slot_sprites/cells.png | Bin 368 -> 1458 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/assets/techreborn/textures/gui/slot_sprites/cells.png b/src/main/resources/assets/techreborn/textures/gui/slot_sprites/cells.png index c68c624d892e4aca906a11236005e0c12d0308ea..b0ab3c0a2edd20d6e2cc1944d8df429514cd2339 100644 GIT binary patch literal 1458 zcmbVM%Zn6881E%yNhE@X1cC?_y$A~F_iWE}VY{q76L-Mg47&rnfe6-ARnHVV-PLy2 zIjV&bErx?aEU_dV+SzB`@G z%g2wMI;Lsb@%Bb@OU@_M_+(lB&%8WBa{4si_^#Bn&xIOGzb9wLn)dN&*4-7m@fC=9 zY9hjW)EuX|L~GiGwQ-K{9u=TR`z#CfzkYtI14cr9XEnCtJfZ`(aahpp!_6)}+`|FU z*Dit!V<-tyDi9c_!>okkP@nKZxmL%P4ki$>7wYRuA=r&OAmRlDtEO*Yr{;osU^>1X zxV5i=Yddwzu3L_0*bcOP=mlW*=~7!k61dg;W~NK-LVX}a4lQdm8kr-{7N6KHH?<;t9)NlRR?Tri#i#fW-*Uxd1}bm~HySF~9<3zH0(HAcDRn6`3h z0wlP?<@?2OqMTrh4rxj=QA(^+VeB+v?Wa|6{Tq1kZ#NZ z@sz}0!4|yRKOY6MF^L7+<3ZAf`yePLWUjpq`(fBhYtTF!HGT5 z{@a4dDn!E%=25k&(g$v^Qah4Kx?;WV<>YRm#OH9?H`KCfSaMUfJetWqSICC; zcYWusYKHCRdbjZ_esy%T_R-m|e!4aoytw)O{U4T|fAQzNA0ID0f4KRZMp`eHPkg!j oXu0!DyZh++AKUsb5AJk7(+u|X>Zy|}w^dhdw>FzkE?v9z4}P=AP5=M^ literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NS%G}c0*}aI z1_q&g5N4EfRNDm-L1P>`6JSE84f zTB2a0XP{?ju$GJK08r5_PZ!6K2=}+=9Qm3Zc$_cBP5LdLx@%L*zJ1Ikj?tY*qi-~( z#AUBtf9aE7)TM2?uZ8a~ z{@#xkr985!T%@{{`AFp_7w;_gj?Ygzr(NL_cz#k?ccrYtxykBLLDmj))cvIzif0)XNC>`kN@m0VzEbU-MlwF jO)u!b2z2Vb^u6~IbN=>6YH$1n^d*C*tDnm{r-UW|5topw From 255f277304ec39a310175c5d5222db8144e78ede Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 14:34:43 +0300 Subject: [PATCH 05/13] Should fix armor rendering --- .../api/recipe/recipes/IndustrialSawmillRecipe.java | 6 ++++-- .../textures/models/armor/bronze_layer_1.png | Bin .../textures/models/armor/bronze_layer_2.png | Bin .../textures/models/armor/cloaking.png | Bin .../textures/models/armor/lapotronpack.png | Bin .../textures/models/armor/lithiumbatpack.png | Bin .../textures/models/armor/peridot_layer_1.png | Bin .../textures/models/armor/peridot_layer_2.png | Bin .../textures/models/armor/ruby_layer_1.png | Bin .../textures/models/armor/ruby_layer_2.png | Bin .../textures/models/armor/sapphire_layer_1.png | Bin .../textures/models/armor/sapphire_layer_2.png | Bin src/main/resources/pack.mcmeta | 2 +- 13 files changed, 5 insertions(+), 3 deletions(-) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/bronze_layer_1.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/bronze_layer_2.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/cloaking.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/lapotronpack.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/lithiumbatpack.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/peridot_layer_1.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/peridot_layer_2.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/ruby_layer_1.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/ruby_layer_2.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/sapphire_layer_1.png (100%) rename src/main/resources/assets/{techreborn => minecraft}/textures/models/armor/sapphire_layer_2.png (100%) diff --git a/src/main/java/techreborn/api/recipe/recipes/IndustrialSawmillRecipe.java b/src/main/java/techreborn/api/recipe/recipes/IndustrialSawmillRecipe.java index d958fbc3c..8978159f3 100644 --- a/src/main/java/techreborn/api/recipe/recipes/IndustrialSawmillRecipe.java +++ b/src/main/java/techreborn/api/recipe/recipes/IndustrialSawmillRecipe.java @@ -29,14 +29,16 @@ import io.github.prospector.silk.fluid.FluidInstance; import net.minecraft.block.entity.BlockEntity; import net.minecraft.fluid.Fluids; import net.minecraft.util.Identifier; -import org.checkerframework.checker.nullness.qual.NonNull; + +import javax.annotation.Nonnull; + import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipeType; import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; public class IndustrialSawmillRecipe extends RebornRecipe { - @NonNull + @Nonnull private FluidInstance fluidInstance = FluidInstance.EMPTY; public IndustrialSawmillRecipe(RebornRecipeType type, Identifier name) { diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/bronze_layer_1.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_1.png rename to src/main/resources/assets/minecraft/textures/models/armor/bronze_layer_1.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/bronze_layer_2.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/bronze_layer_2.png rename to src/main/resources/assets/minecraft/textures/models/armor/bronze_layer_2.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/cloaking.png b/src/main/resources/assets/minecraft/textures/models/armor/cloaking.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/cloaking.png rename to src/main/resources/assets/minecraft/textures/models/armor/cloaking.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/lapotronpack.png b/src/main/resources/assets/minecraft/textures/models/armor/lapotronpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/lapotronpack.png rename to src/main/resources/assets/minecraft/textures/models/armor/lapotronpack.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/lithiumbatpack.png b/src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/lithiumbatpack.png rename to src/main/resources/assets/minecraft/textures/models/armor/lithiumbatpack.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/peridot_layer_1.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_1.png rename to src/main/resources/assets/minecraft/textures/models/armor/peridot_layer_1.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/peridot_layer_2.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/peridot_layer_2.png rename to src/main/resources/assets/minecraft/textures/models/armor/peridot_layer_2.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/ruby_layer_1.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_1.png rename to src/main/resources/assets/minecraft/textures/models/armor/ruby_layer_1.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/ruby_layer_2.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/ruby_layer_2.png rename to src/main/resources/assets/minecraft/textures/models/armor/ruby_layer_2.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png b/src/main/resources/assets/minecraft/textures/models/armor/sapphire_layer_1.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_1.png rename to src/main/resources/assets/minecraft/textures/models/armor/sapphire_layer_1.png diff --git a/src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png b/src/main/resources/assets/minecraft/textures/models/armor/sapphire_layer_2.png similarity index 100% rename from src/main/resources/assets/techreborn/textures/models/armor/sapphire_layer_2.png rename to src/main/resources/assets/minecraft/textures/models/armor/sapphire_layer_2.png diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index a065ad332..338195f74 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack":{ - "pack_format":3, + "pack_format":4, "description":"Tech Reborn Resources" } } \ No newline at end of file From 0d9ddc03decae3d42ac785d7f98d7ffb95103687 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 16:33:35 +0300 Subject: [PATCH 06/13] Start of machine blocks generalization --- .../blocks/GenericMachineBlock.java | 48 ++++++++++++++++++ .../blocks/tier1/BlockAssemblingMachine.java | 49 ------------------- .../techreborn/blocks/tier1/BlockGrinder.java | 45 ----------------- src/main/java/techreborn/init/TRContent.java | 6 ++- 4 files changed, 52 insertions(+), 96 deletions(-) create mode 100644 src/main/java/techreborn/blocks/GenericMachineBlock.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockGrinder.java diff --git a/src/main/java/techreborn/blocks/GenericMachineBlock.java b/src/main/java/techreborn/blocks/GenericMachineBlock.java new file mode 100644 index 000000000..d7e691179 --- /dev/null +++ b/src/main/java/techreborn/blocks/GenericMachineBlock.java @@ -0,0 +1,48 @@ +/** + * + */ +package techreborn.blocks; + +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.world.BlockView; +import reborncore.api.blockentity.IMachineGuiHandler; +import reborncore.common.blocks.BlockMachineBase; +import techreborn.client.EGui; + +/** + * @author drcrazy + * @param + * + */ +public class GenericMachineBlock extends BlockMachineBase { + + private EGui gui; + private Class blockEntityClass; + + public GenericMachineBlock(EGui gui, Class blockEntityClass) { + super(); + this.blockEntityClass = blockEntityClass; + this.gui = gui; + } + + @Override + public BlockEntity createBlockEntity(BlockView worldIn) { + if (blockEntityClass == null) { + return null; + } + BlockEntity blockEntity = null; + try { + blockEntity = (BlockEntity) blockEntityClass.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new RuntimeException("Failed to create BlockEntity blockEntity", e); + } + + return blockEntity; + } + + @Override + public IMachineGuiHandler getGui() { + return gui; + } + +} diff --git a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java deleted file mode 100644 index 8268279ee..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockAssemblingMachine.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.AssemblingMachineBlockEntity; - -public class BlockAssemblingMachine extends BlockMachineBase { - - public BlockAssemblingMachine() { - super(); - } - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new AssemblingMachineBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.ASSEMBLING_MACHINE; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java b/src/main/java/techreborn/blocks/tier1/BlockGrinder.java deleted file mode 100644 index 9eb103c73..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockGrinder.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.GrinderBlockEntity; - -public class BlockGrinder extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new GrinderBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.GRINDER; - } -} diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 3baa625ad..5f40e4e0b 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -48,12 +48,14 @@ import techreborn.blocks.tier3.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; import techreborn.blocks.transformers.BlockMVTransformer; +import techreborn.client.EGui; import techreborn.config.ConfigTechReborn; import techreborn.entities.EntityNukePrimed; import techreborn.items.ItemDynamicCell; import techreborn.items.ItemUpgrade; import techreborn.utils.InitUtils; import techreborn.blockentity.storage.AdjustableSUBlockEntity; +import techreborn.blockentity.machine.tier1.*; import javax.annotation.Nullable; import java.util.Arrays; @@ -364,14 +366,14 @@ public class TRContent { public enum Machine implements ItemConvertible { ALLOY_SMELTER(new BlockAlloySmelter()), - ASSEMBLY_MACHINE(new BlockAssemblingMachine()), + ASSEMBLY_MACHINE(new GenericMachineBlock(EGui.ASSEMBLING_MACHINE, AssemblingMachineBlockEntity.class)), AUTO_CRAFTING_TABLE(new BlockAutoCraftingTable()), CHEMICAL_REACTOR(new BlockChemicalReactor()), COMPRESSOR(new BlockCompressor()), DISTILLATION_TOWER(new BlockDistillationTower()), EXTRACTOR(new BlockExtractor()), FLUID_REPLICATOR(new BlockFluidReplicator()), - GRINDER(new BlockGrinder()), + GRINDER(new GenericMachineBlock(EGui.GRINDER, GrinderBlockEntity.class)), ELECTRIC_FURNACE(new BlockElectricFurnace()), IMPLOSION_COMPRESSOR(new BlockImplosionCompressor()), INDUSTRIAL_BLAST_FURNACE(new BlockIndustrialBlastFurnace()), From 901a4c106a0de1f82e41f2fdaf36737045ad9b29 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 17:45:59 +0300 Subject: [PATCH 07/13] Separate blocks for Tier1 machines gone --- .../blocks/GenericMachineBlock.java | 16 ++---- .../blocks/tier1/BlockAlloySmelter.java | 49 ------------------- .../blocks/tier1/BlockAutoCraftingTable.java | 45 ----------------- .../blocks/tier1/BlockCompressor.java | 45 ----------------- .../blocks/tier1/BlockElectricFurnace.java | 45 ----------------- .../blocks/tier1/BlockExtractor.java | 45 ----------------- .../blocks/tier1/BlockRecycler.java | 45 ----------------- .../blocks/tier1/BlockRollingMachine.java | 45 ----------------- .../blocks/tier1/BlockScrapboxinator.java | 45 ----------------- src/main/java/techreborn/init/TRContent.java | 20 ++++---- 10 files changed, 15 insertions(+), 385 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockCompressor.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockExtractor.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockRecycler.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java delete mode 100644 src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java diff --git a/src/main/java/techreborn/blocks/GenericMachineBlock.java b/src/main/java/techreborn/blocks/GenericMachineBlock.java index d7e691179..81774d1dc 100644 --- a/src/main/java/techreborn/blocks/GenericMachineBlock.java +++ b/src/main/java/techreborn/blocks/GenericMachineBlock.java @@ -3,6 +3,8 @@ */ package techreborn.blocks; +import java.util.function.Supplier; + import net.minecraft.block.entity.BlockEntity; import net.minecraft.world.BlockView; import reborncore.api.blockentity.IMachineGuiHandler; @@ -11,15 +13,14 @@ import techreborn.client.EGui; /** * @author drcrazy - * @param * */ public class GenericMachineBlock extends BlockMachineBase { private EGui gui; - private Class blockEntityClass; + private Supplier blockEntityClass; - public GenericMachineBlock(EGui gui, Class blockEntityClass) { + public GenericMachineBlock(EGui gui, Supplier blockEntityClass) { super(); this.blockEntityClass = blockEntityClass; this.gui = gui; @@ -30,14 +31,7 @@ public class GenericMachineBlock extends BlockMachineBase { if (blockEntityClass == null) { return null; } - BlockEntity blockEntity = null; - try { - blockEntity = (BlockEntity) blockEntityClass.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new RuntimeException("Failed to create BlockEntity blockEntity", e); - } - - return blockEntity; + return blockEntityClass.get(); } @Override diff --git a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java deleted file mode 100644 index 45f36012f..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockAlloySmelter.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.AlloySmelterBlockEntity; - -public class BlockAlloySmelter extends BlockMachineBase { - - public BlockAlloySmelter() { - super(); - } - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new AlloySmelterBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.ALLOY_SMELTER; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java b/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java deleted file mode 100644 index 96e03091b..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockAutoCraftingTable.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.AutoCraftingTableBlockEntity; - -public class BlockAutoCraftingTable extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new AutoCraftingTableBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.AUTO_CRAFTING_TABLE; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java b/src/main/java/techreborn/blocks/tier1/BlockCompressor.java deleted file mode 100644 index 6c9834928..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockCompressor.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.CompressorBlockEntity; - -public class BlockCompressor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new CompressorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.COMPRESSOR; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java b/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java deleted file mode 100644 index 3703ae29a..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockElectricFurnace.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.ElectricFurnaceBlockEntity; - -public class BlockElectricFurnace extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ElectricFurnaceBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.ELECTRIC_FURNACE; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java b/src/main/java/techreborn/blocks/tier1/BlockExtractor.java deleted file mode 100644 index 51599117b..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockExtractor.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.ExtractorBlockEntity; - -public class BlockExtractor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ExtractorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.EXTRACTOR; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java b/src/main/java/techreborn/blocks/tier1/BlockRecycler.java deleted file mode 100644 index 77cc44be1..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockRecycler.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.RecyclerBlockEntity; - -public class BlockRecycler extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new RecyclerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.RECYCLER; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java b/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java deleted file mode 100644 index 0ef585167..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockRollingMachine.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.RollingMachineBlockEntity; - -public class BlockRollingMachine extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new RollingMachineBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.ROLLING_MACHINE; - } -} diff --git a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java b/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java deleted file mode 100644 index 00c5d13c8..000000000 --- a/src/main/java/techreborn/blocks/tier1/BlockScrapboxinator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier1; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.ScrapboxinatorBlockEntity; - -public class BlockScrapboxinator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ScrapboxinatorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.SCRAPBOXINATOR; - } -} diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index 5f40e4e0b..b8c4babbd 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -365,16 +365,16 @@ public class TRContent { public enum Machine implements ItemConvertible { - ALLOY_SMELTER(new BlockAlloySmelter()), - ASSEMBLY_MACHINE(new GenericMachineBlock(EGui.ASSEMBLING_MACHINE, AssemblingMachineBlockEntity.class)), - AUTO_CRAFTING_TABLE(new BlockAutoCraftingTable()), + ALLOY_SMELTER(new GenericMachineBlock(EGui.ALLOY_SMELTER, () -> new AlloySmelterBlockEntity())), + ASSEMBLY_MACHINE(new GenericMachineBlock(EGui.ASSEMBLING_MACHINE, () -> new AssemblingMachineBlockEntity())), + AUTO_CRAFTING_TABLE(new GenericMachineBlock(EGui.AUTO_CRAFTING_TABLE, () -> new AutoCraftingTableBlockEntity())), CHEMICAL_REACTOR(new BlockChemicalReactor()), - COMPRESSOR(new BlockCompressor()), + COMPRESSOR(new GenericMachineBlock(EGui.COMPRESSOR, () -> new CompressorBlockEntity())), DISTILLATION_TOWER(new BlockDistillationTower()), - EXTRACTOR(new BlockExtractor()), + EXTRACTOR(new GenericMachineBlock(EGui.EXTRACTOR, () -> new ExtractorBlockEntity())), FLUID_REPLICATOR(new BlockFluidReplicator()), - GRINDER(new GenericMachineBlock(EGui.GRINDER, GrinderBlockEntity.class)), - ELECTRIC_FURNACE(new BlockElectricFurnace()), + GRINDER(new GenericMachineBlock(EGui.GRINDER, () -> new GrinderBlockEntity())), + ELECTRIC_FURNACE(new GenericMachineBlock(EGui.ELECTRIC_FURNACE, () -> new ElectricFurnaceBlockEntity())), IMPLOSION_COMPRESSOR(new BlockImplosionCompressor()), INDUSTRIAL_BLAST_FURNACE(new BlockIndustrialBlastFurnace()), INDUSTRIAL_CENTRIFUGE(new BlockIndustrialCentrifuge()), @@ -384,9 +384,9 @@ public class TRContent { IRON_ALLOY_FURNACE(new BlockIronAlloyFurnace()), IRON_FURNACE(new BlockIronFurnace()), MATTER_FABRICATOR(new BlockMatterFabricator()), - RECYCLER(new BlockRecycler()), - ROLLING_MACHINE(new BlockRollingMachine()), - SCRAPBOXINATOR(new BlockScrapboxinator()), + RECYCLER(new GenericMachineBlock(EGui.RECYCLER, () -> new RecyclerBlockEntity())), + ROLLING_MACHINE(new GenericMachineBlock(EGui.ROLLING_MACHINE, () -> new RollingMachineBlockEntity())), + SCRAPBOXINATOR(new GenericMachineBlock(EGui.SCRAPBOXINATOR, () -> new ScrapboxinatorBlockEntity())), VACUUM_FREEZER(new BlockVacuumFreezer()), DIESEL_GENERATOR(new BlockDieselGenerator()), From 40755131a4487958bde025f3d1afe445716f2e68 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 20:30:28 +0300 Subject: [PATCH 08/13] Even more blocks removed --- .../generator/BlockDieselGenerator.java | 48 ----------- .../generator/BlockDragonEggSyphon.java | 44 ---------- .../blocks/generator/BlockGasTurbine.java | 45 ----------- .../blocks/generator/BlockLightningRod.java | 44 ---------- .../generator/BlockPlasmaGenerator.java | 48 ----------- .../generator/BlockSemiFluidGenerator.java | 45 ----------- .../generator/BlockSolidFuelGenerator.java | 49 ------------ .../generator/BlockThermalGenerator.java | 45 ----------- .../blocks/generator/BlockWaterMill.java | 47 ----------- .../blocks/generator/BlockWindMill.java | 47 ----------- .../blocks/tier2/BlockChargeOMat.java | 50 ------------ .../blocks/tier2/BlockChemicalReactor.java | 50 ------------ .../blocks/tier2/BlockDigitalChest.java | 50 ------------ .../blocks/tier2/BlockDistillationTower.java | 50 ------------ .../tier2/BlockImplosionCompressor.java | 50 ------------ .../tier2/BlockIndustrialBlastFurnace.java | 50 ------------ .../tier2/BlockIndustrialCentrifuge.java | 50 ------------ .../tier2/BlockIndustrialElectrolyzer.java | 50 ------------ .../blocks/tier2/BlockIndustrialGrinder.java | 50 ------------ .../blocks/tier2/BlockIndustrialSawmill.java | 50 ------------ .../blocks/tier2/BlockVacuumFreezer.java | 50 ------------ .../blocks/tier3/BlockChunkLoader.java | 50 ------------ .../tier3/BlockCreativeQuantumTank.java | 50 ------------ .../blocks/tier3/BlockFluidReplicator.java | 50 ------------ .../blocks/tier3/BlockMatterFabricator.java | 50 ------------ .../blocks/tier3/BlockQuantumChest.java | 50 ------------ .../blocks/tier3/BlockQuantumTank.java | 50 ------------ src/main/java/techreborn/init/TRContent.java | 80 ++++++++++++------- 28 files changed, 52 insertions(+), 1340 deletions(-) delete mode 100644 src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockGasTurbine.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockLightningRod.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockWaterMill.java delete mode 100644 src/main/java/techreborn/blocks/generator/BlockWindMill.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java delete mode 100644 src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java delete mode 100644 src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java diff --git a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java b/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java deleted file mode 100644 index 099b769c1..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockDieselGenerator.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; - -/** - * Block for Diesel Generator - */ -public class BlockDieselGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DieselGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DIESEL_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java b/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java deleted file mode 100644 index 732be488b..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockDragonEggSyphon.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity; - -public class BlockDragonEggSyphon extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DragonEggSyphonBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java b/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java deleted file mode 100644 index 2e89aa4b4..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockGasTurbine.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; - -public class BlockGasTurbine extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new GasTurbineBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.GAS_TURBINE; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java b/src/main/java/techreborn/blocks/generator/BlockLightningRod.java deleted file mode 100644 index 43015c405..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockLightningRod.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.LightningRodBlockEntity; - -public class BlockLightningRod extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new LightningRodBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java b/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java deleted file mode 100644 index 2c9d6e7c2..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockPlasmaGenerator.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; - -/** - * Block for Plasma Generator - */ -public class BlockPlasmaGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new PlasmaGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.PLASMA_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java deleted file mode 100644 index c2ea70a8c..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockSemiFluidGenerator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; - -public class BlockSemiFluidGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new SemiFluidGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.SEMIFLUID_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java b/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java deleted file mode 100644 index 79e98be07..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockSolidFuelGenerator.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; - -public class BlockSolidFuelGenerator extends BlockMachineBase { - - public BlockSolidFuelGenerator() { - super(); - } - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new SolidFuelGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java deleted file mode 100644 index 8c12fa21e..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockThermalGenerator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; - -public class BlockThermalGenerator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ThermalGeneratorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.THERMAL_GENERATOR; - } -} diff --git a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java b/src/main/java/techreborn/blocks/generator/BlockWaterMill.java deleted file mode 100644 index fef57c207..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockWaterMill.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.basic.WaterMillBlockEntity; - -/** - * Created by modmuss50 on 25/02/2016. - */ -public class BlockWaterMill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new WaterMillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/generator/BlockWindMill.java b/src/main/java/techreborn/blocks/generator/BlockWindMill.java deleted file mode 100644 index 6a45d2f31..000000000 --- a/src/main/java/techreborn/blocks/generator/BlockWindMill.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.generator; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.blockentity.generator.basic.WindMillBlockEntity; - -/** - * Created by modmuss50 on 25/02/2016. - */ -public class BlockWindMill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new WindMillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return null; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java b/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java deleted file mode 100644 index f39eec2a7..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockChargeOMat.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.ChargeOMatBlockEntity; - -public class BlockChargeOMat extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChargeOMatBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHARGEBENCH; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java deleted file mode 100644 index 3d921dca8..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockChemicalReactor.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.ChemicalReactorBlockEntity; - -public class BlockChemicalReactor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChemicalReactorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHEMICAL_REACTOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java b/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java deleted file mode 100644 index f99990fd4..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockDigitalChest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.DigitalChestBlockEntity; - -public class BlockDigitalChest extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DigitalChestBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DIGITAL_CHEST; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java b/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java deleted file mode 100644 index 124a386a1..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockDistillationTower.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; - -public class BlockDistillationTower extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new DistillationTowerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.DISTILLATION_TOWER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java deleted file mode 100644 index a85a0fc7f..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockImplosionCompressor.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; - -public class BlockImplosionCompressor extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ImplosionCompressorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.IMPLOSION_COMPRESSOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java deleted file mode 100644 index e06e42558..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialBlastFurnace.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; - -public class BlockIndustrialBlastFurnace extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialBlastFurnaceBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.BLAST_FURNACE; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java deleted file mode 100644 index 38395e08a..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialCentrifuge.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.IndustrialCentrifugeBlockEntity; - -public class BlockIndustrialCentrifuge extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialCentrifugeBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CENTRIFUGE; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java deleted file mode 100644 index eb6c1d1e5..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialElectrolyzer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier1.IndustrialElectrolyzerBlockEntity; - -public class BlockIndustrialElectrolyzer extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialElectrolyzerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.INDUSTRIAL_ELECTROLYZER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java deleted file mode 100644 index 4e3e93a17..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialGrinder.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; - -public class BlockIndustrialGrinder extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialGrinderBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.INDUSTRIAL_GRINDER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java b/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java deleted file mode 100644 index d13e3989f..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockIndustrialSawmill.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; - -public class BlockIndustrialSawmill extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new IndustrialSawmillBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.SAWMILL; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java b/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java deleted file mode 100644 index e43c37365..000000000 --- a/src/main/java/techreborn/blocks/tier2/BlockVacuumFreezer.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier2; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; - -public class BlockVacuumFreezer extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new VacuumFreezerBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.VACUUM_FREEZER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java b/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java deleted file mode 100644 index 827a099f0..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockChunkLoader.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; - -public class BlockChunkLoader extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new ChunkLoaderBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.CHUNK_LOADER; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java deleted file mode 100644 index 13ba70f7f..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockCreativeQuantumTank.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity; - -public class BlockCreativeQuantumTank extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new CreativeQuantumTankBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_TANK; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java b/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java deleted file mode 100644 index 73eb0b74e..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockFluidReplicator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; - -public class BlockFluidReplicator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new FluidReplicatorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.FLUID_REPLICATOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java deleted file mode 100644 index c2f392ef7..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockMatterFabricator.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; - -public class BlockMatterFabricator extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new MatterFabricatorBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.MATTER_FABRICATOR; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java deleted file mode 100644 index 89edc9a2e..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumChest.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity; - -public class BlockQuantumChest extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new QuantumChestBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_CHEST; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java b/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java deleted file mode 100644 index 0f48e1efe..000000000 --- a/src/main/java/techreborn/blocks/tier3/BlockQuantumTank.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.blocks.tier3; - -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.world.BlockView; -import reborncore.api.blockentity.IMachineGuiHandler; -import reborncore.common.blocks.BlockMachineBase; -import techreborn.client.EGui; -import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; - -public class BlockQuantumTank extends BlockMachineBase { - - @Override - public BlockEntity createBlockEntity(BlockView worldIn) { - return new QuantumTankBlockEntity(); - } - - @Override - public IMachineGuiHandler getGui() { - return EGui.QUANTUM_TANK; - } - - @Override - public boolean isAdvanced() { - return true; - } -} diff --git a/src/main/java/techreborn/init/TRContent.java b/src/main/java/techreborn/init/TRContent.java index b8c4babbd..a990832f7 100644 --- a/src/main/java/techreborn/init/TRContent.java +++ b/src/main/java/techreborn/init/TRContent.java @@ -43,7 +43,6 @@ import techreborn.blocks.storage.*; import techreborn.blocks.tier0.BlockIronAlloyFurnace; import techreborn.blocks.tier0.BlockIronFurnace; import techreborn.blocks.tier1.*; -import techreborn.blocks.tier2.*; import techreborn.blocks.tier3.*; import techreborn.blocks.transformers.BlockHVTransformer; import techreborn.blocks.transformers.BlockLVTransformer; @@ -55,7 +54,32 @@ import techreborn.items.ItemDynamicCell; import techreborn.items.ItemUpgrade; import techreborn.utils.InitUtils; import techreborn.blockentity.storage.AdjustableSUBlockEntity; +import techreborn.blockentity.ChargeOMatBlockEntity; +import techreborn.blockentity.DigitalChestBlockEntity; +import techreborn.blockentity.IndustrialCentrifugeBlockEntity; +import techreborn.blockentity.generator.LightningRodBlockEntity; +import techreborn.blockentity.generator.PlasmaGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.DieselGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.DragonEggSyphonBlockEntity; +import techreborn.blockentity.generator.advanced.GasTurbineBlockEntity; +import techreborn.blockentity.generator.advanced.SemiFluidGeneratorBlockEntity; +import techreborn.blockentity.generator.advanced.ThermalGeneratorBlockEntity; +import techreborn.blockentity.generator.basic.SolidFuelGeneratorBlockEntity; +import techreborn.blockentity.generator.basic.WaterMillBlockEntity; +import techreborn.blockentity.generator.basic.WindMillBlockEntity; +import techreborn.blockentity.machine.multiblock.DistillationTowerBlockEntity; +import techreborn.blockentity.machine.multiblock.FluidReplicatorBlockEntity; +import techreborn.blockentity.machine.multiblock.ImplosionCompressorBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialBlastFurnaceBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialGrinderBlockEntity; +import techreborn.blockentity.machine.multiblock.IndustrialSawmillBlockEntity; +import techreborn.blockentity.machine.multiblock.VacuumFreezerBlockEntity; import techreborn.blockentity.machine.tier1.*; +import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity; +import techreborn.blockentity.machine.tier3.CreativeQuantumTankBlockEntity; +import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity; +import techreborn.blockentity.machine.tier3.QuantumChestBlockEntity; +import techreborn.blockentity.machine.tier3.QuantumTankBlockEntity; import javax.annotation.Nullable; import java.util.Arrays; @@ -368,50 +392,50 @@ public class TRContent { ALLOY_SMELTER(new GenericMachineBlock(EGui.ALLOY_SMELTER, () -> new AlloySmelterBlockEntity())), ASSEMBLY_MACHINE(new GenericMachineBlock(EGui.ASSEMBLING_MACHINE, () -> new AssemblingMachineBlockEntity())), AUTO_CRAFTING_TABLE(new GenericMachineBlock(EGui.AUTO_CRAFTING_TABLE, () -> new AutoCraftingTableBlockEntity())), - CHEMICAL_REACTOR(new BlockChemicalReactor()), + CHEMICAL_REACTOR(new GenericMachineBlock(EGui.CHEMICAL_REACTOR, () -> new ChemicalReactorBlockEntity())), COMPRESSOR(new GenericMachineBlock(EGui.COMPRESSOR, () -> new CompressorBlockEntity())), - DISTILLATION_TOWER(new BlockDistillationTower()), + DISTILLATION_TOWER(new GenericMachineBlock(EGui.DISTILLATION_TOWER, () -> new DistillationTowerBlockEntity())), EXTRACTOR(new GenericMachineBlock(EGui.EXTRACTOR, () -> new ExtractorBlockEntity())), - FLUID_REPLICATOR(new BlockFluidReplicator()), + FLUID_REPLICATOR(new GenericMachineBlock(EGui.FLUID_REPLICATOR, () -> new FluidReplicatorBlockEntity())), GRINDER(new GenericMachineBlock(EGui.GRINDER, () -> new GrinderBlockEntity())), ELECTRIC_FURNACE(new GenericMachineBlock(EGui.ELECTRIC_FURNACE, () -> new ElectricFurnaceBlockEntity())), - IMPLOSION_COMPRESSOR(new BlockImplosionCompressor()), - INDUSTRIAL_BLAST_FURNACE(new BlockIndustrialBlastFurnace()), - INDUSTRIAL_CENTRIFUGE(new BlockIndustrialCentrifuge()), - INDUSTRIAL_ELECTROLYZER(new BlockIndustrialElectrolyzer()), - INDUSTRIAL_GRINDER(new BlockIndustrialGrinder()), - INDUSTRIAL_SAWMILL(new BlockIndustrialSawmill()), + IMPLOSION_COMPRESSOR(new GenericMachineBlock(EGui.IMPLOSION_COMPRESSOR, () -> new ImplosionCompressorBlockEntity())), + INDUSTRIAL_BLAST_FURNACE(new GenericMachineBlock(EGui.BLAST_FURNACE, () -> new IndustrialBlastFurnaceBlockEntity())), + INDUSTRIAL_CENTRIFUGE(new GenericMachineBlock(EGui.CENTRIFUGE, () -> new IndustrialCentrifugeBlockEntity())), + INDUSTRIAL_ELECTROLYZER(new GenericMachineBlock(EGui.INDUSTRIAL_ELECTROLYZER, () -> new IndustrialElectrolyzerBlockEntity())), + INDUSTRIAL_GRINDER(new GenericMachineBlock(EGui.INDUSTRIAL_GRINDER, () -> new IndustrialGrinderBlockEntity())), + INDUSTRIAL_SAWMILL(new GenericMachineBlock(EGui.SAWMILL, () -> new IndustrialSawmillBlockEntity())), IRON_ALLOY_FURNACE(new BlockIronAlloyFurnace()), IRON_FURNACE(new BlockIronFurnace()), - MATTER_FABRICATOR(new BlockMatterFabricator()), + MATTER_FABRICATOR(new GenericMachineBlock(EGui.MATTER_FABRICATOR, () -> new MatterFabricatorBlockEntity())), RECYCLER(new GenericMachineBlock(EGui.RECYCLER, () -> new RecyclerBlockEntity())), ROLLING_MACHINE(new GenericMachineBlock(EGui.ROLLING_MACHINE, () -> new RollingMachineBlockEntity())), SCRAPBOXINATOR(new GenericMachineBlock(EGui.SCRAPBOXINATOR, () -> new ScrapboxinatorBlockEntity())), - VACUUM_FREEZER(new BlockVacuumFreezer()), + VACUUM_FREEZER(new GenericMachineBlock(EGui.VACUUM_FREEZER, () -> new VacuumFreezerBlockEntity())), - DIESEL_GENERATOR(new BlockDieselGenerator()), - DRAGON_EGG_SYPHON(new BlockDragonEggSyphon()), + DIESEL_GENERATOR(new GenericMachineBlock(EGui.DIESEL_GENERATOR, () -> new DieselGeneratorBlockEntity())), + DRAGON_EGG_SYPHON(new GenericMachineBlock(null, () -> new DragonEggSyphonBlockEntity())), FUSION_COIL(new BlockFusionCoil()), FUSION_CONTROL_COMPUTER(new BlockFusionControlComputer()), - GAS_TURBINE(new BlockGasTurbine()), - LIGHTNING_ROD(new BlockLightningRod()), + GAS_TURBINE(new GenericMachineBlock(EGui.GAS_TURBINE, () -> new GasTurbineBlockEntity())), + LIGHTNING_ROD(new GenericMachineBlock(null, () -> new LightningRodBlockEntity())), MAGIC_ENERGY_ABSORBER (new BlockMagicEnergyAbsorber()), MAGIC_ENERGY_CONVERTER(new BlockMagicEnergyConverter()), - PLASMA_GENERATOR(new BlockPlasmaGenerator()), - SEMI_FLUID_GENERATOR(new BlockSemiFluidGenerator()), - SOLID_FUEL_GENERATOR(new BlockSolidFuelGenerator()), - THERMAL_GENERATOR(new BlockThermalGenerator()), - WATER_MILL(new BlockWaterMill()), - WIND_MILL(new BlockWindMill()), + PLASMA_GENERATOR(new GenericMachineBlock(EGui.PLASMA_GENERATOR, () -> new PlasmaGeneratorBlockEntity())), + SEMI_FLUID_GENERATOR(new GenericMachineBlock(EGui.SEMIFLUID_GENERATOR, () -> new SemiFluidGeneratorBlockEntity())), + SOLID_FUEL_GENERATOR(new GenericMachineBlock(EGui.GENERATOR, () -> new SolidFuelGeneratorBlockEntity())), + THERMAL_GENERATOR(new GenericMachineBlock(EGui.THERMAL_GENERATOR, () -> new ThermalGeneratorBlockEntity())), + WATER_MILL(new GenericMachineBlock(null, () -> new WaterMillBlockEntity())), + WIND_MILL(new GenericMachineBlock(null, () -> new WindMillBlockEntity())), CREATIVE_QUANTUM_CHEST(new BlockCreativeQuantumChest()), - CREATIVE_QUANTUM_TANK(new BlockCreativeQuantumTank()), - DIGITAL_CHEST(new BlockDigitalChest()), - QUANTUM_CHEST(new BlockQuantumChest()), - QUANTUM_TANK(new BlockQuantumTank()), + CREATIVE_QUANTUM_TANK(new GenericMachineBlock(EGui.QUANTUM_TANK, () -> new CreativeQuantumTankBlockEntity())), + DIGITAL_CHEST(new GenericMachineBlock(EGui.DIGITAL_CHEST, () -> new DigitalChestBlockEntity())), + QUANTUM_CHEST(new GenericMachineBlock(EGui.QUANTUM_CHEST, () -> new QuantumChestBlockEntity())), + QUANTUM_TANK(new GenericMachineBlock(EGui.QUANTUM_TANK, () -> new QuantumTankBlockEntity())), ADJUSTABLE_SU(new BlockAdjustableSU()), - CHARGE_O_MAT(new BlockChargeOMat()), + CHARGE_O_MAT(new GenericMachineBlock(EGui.CHARGEBENCH, () -> new ChargeOMatBlockEntity())), INTERDIMENSIONAL_SU(new BlockInterdimensionalSU()), LAPOTRONIC_SU(new BlockLapotronicSU()), LSU_STORAGE(new BlockLSUStorage()), @@ -423,7 +447,7 @@ public class TRContent { HV_TRANSFORMER(new BlockHVTransformer()), ALARM(new BlockAlarm()), - CHUNK_LOADER(new BlockChunkLoader()), + CHUNK_LOADER(new GenericMachineBlock(EGui.CHUNK_LOADER, () -> new ChunkLoaderBlockEntity())), LAMP_INCANDESCENT(new BlockLamp(14, 4, 10, 8)), LAMP_LED(new BlockLamp(15, 1, 1, 12)), PLAYER_DETECTOR(new BlockPlayerDetector()); From 0dd2f078ba8893fc523b811a53f7a383f3e4b915 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 21:05:42 +0300 Subject: [PATCH 09/13] Fix build and recipe --- .../blockentity/generator/basic/WaterMillBlockEntity.java | 6 +++--- .../machine/tier1/AutoCraftingTableBlockEntity.java | 2 +- .../data/techreborn/recipes/compressor/obsidian_plate.json | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java index b85015653..2cce944e4 100644 --- a/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java +++ b/src/main/java/techreborn/blockentity/generator/basic/WaterMillBlockEntity.java @@ -29,11 +29,11 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.math.Direction; import reborncore.api.IToolDrop; +import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PowerAcceptorBlockEntity; import reborncore.common.registration.RebornRegister; import reborncore.common.registration.config.ConfigRegistry; import techreborn.TechReborn; -import techreborn.blocks.generator.BlockWindMill; import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; @@ -65,10 +65,10 @@ public class WaterMillBlockEntity extends PowerAcceptorBlockEntity implements IT } if (waterblocks > 0) { addEnergy(waterblocks * energyMultiplier); - world.setBlockState(pos, world.getBlockState(pos).with(BlockWindMill.ACTIVE, true)); + world.setBlockState(pos, world.getBlockState(pos).with(BlockMachineBase.ACTIVE, true)); } else { - world.setBlockState(pos, world.getBlockState(pos).with(BlockWindMill.ACTIVE, false)); + world.setBlockState(pos, world.getBlockState(pos).with(BlockMachineBase.ACTIVE, false)); } } diff --git a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java index 81385d0e0..3f9efa656 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/AutoCraftingTableBlockEntity.java @@ -185,7 +185,7 @@ public class AutoCraftingTableBlockEntity extends PowerAcceptorBlockEntity return false; } - public boolean make(Recipe recipe) { + public boolean make(Recipe recipe) { if (recipe == null || !canMake(recipe)) { return false; } diff --git a/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate.json b/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate.json index 3f71e0fdc..38e900d74 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate.json +++ b/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate.json @@ -9,7 +9,8 @@ ], "results": [ { - "item": "techreborn:obsidian_plate" + "item": "techreborn:obsidian_plate", + "count": 9 } ] } \ No newline at end of file From 906999f4b49eb8fd791210b37a60647fe37478f3 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 2 Aug 2019 00:33:21 +0300 Subject: [PATCH 10/13] Compressor recipes reviewed. Couple are missing --- src/main/java/techreborn/rei/ReiPlugin.java | 5 ++++- .../{auto => }/advanced_alloy_plate.json | 0 .../compressor/{auto => }/aluminum_plate.json | 0 ...ate_2.json => aluminum_plate_from_block.json} | 0 .../compressor/auto/aluminum_plate_1.json | 15 --------------- .../recipes/compressor/auto/brass_plate_1.json | 15 --------------- .../recipes/compressor/auto/bronze_plate_1.json | 15 --------------- .../recipes/compressor/auto/chrome_plate_1.json | 15 --------------- .../recipes/compressor/auto/copper_plate_1.json | 15 --------------- .../compressor/auto/electrum_plate_1.json | 15 --------------- .../recipes/compressor/auto/gold_plate_1.json | 15 --------------- .../recipes/compressor/auto/invar_plate_1.json | 15 --------------- .../compressor/auto/iridium_alloy_plate.json | 15 --------------- .../recipes/compressor/auto/iridium_plate.json | 15 --------------- .../recipes/compressor/auto/iridium_plate_1.json | 16 ---------------- .../recipes/compressor/auto/iron_plate_1.json | 15 --------------- .../recipes/compressor/auto/lead_plate_1.json | 15 --------------- .../recipes/compressor/auto/nickel_plate_1.json | 15 --------------- .../compressor/auto/platinum_plate_1.json | 15 --------------- .../recipes/compressor/auto/silver_plate_1.json | 15 --------------- .../recipes/compressor/auto/steel_plate_1.json | 15 --------------- .../recipes/compressor/auto/tin_plate_1.json | 15 --------------- .../compressor/auto/titanium_plate_1.json | 15 --------------- .../compressor/auto/tungsten_plate_1.json | 15 --------------- .../recipes/compressor/auto/zinc_plate_1.json | 15 --------------- .../compressor/{auto => }/brass_plate.json | 0 ..._plate_2.json => brass_plate_from_block.json} | 0 .../compressor/{auto => }/bronze_plate.json | 0 ...plate_2.json => bronze_plate_from_block.json} | 0 .../compressor/{auto => }/chrome_plate.json | 0 ...plate_2.json => chrome_plate_from_block.json} | 0 .../compressor/{auto => }/coal_plate.json | 0 ...l_plate_1.json => coal_plate_from_block.json} | 0 .../compressor/{auto => }/copper_plate.json | 0 ...plate_2.json => copper_plate_from_block.json} | 0 .../compressor/{auto => }/diamond_plate.json | 0 ...late_1.json => diamond_plate_from_block.json} | 0 .../compressor/{auto => }/electrum_plate.json | 0 ...ate_2.json => electrum_plate_from_block.json} | 0 .../compressor/{auto => }/emerald_plate.json | 0 ...late_1.json => emerald_plate_from_block.json} | 0 .../compressor/{auto => }/gold_plate.json | 0 ...d_plate_2.json => gold_plate_from_block.json} | 0 .../compressor/{auto => }/invar_plate.json | 0 ..._plate_2.json => invar_plate_from_block.json} | 0 .../compressor/{auto => }/iron_plate.json | 0 ...n_plate_2.json => iron_plate_from_block.json} | 0 ...is_plate.json => lapis_plate_from_block.json} | 0 .../compressor/{auto => }/lazurite_plate.json | 0 .../compressor/{auto => }/lead_plate.json | 0 ...d_plate_2.json => lead_plate_from_block.json} | 0 .../compressor/{auto => }/nickel_plate.json | 0 ...plate_2.json => nickel_plate_from_block.json} | 0 ..._plate.json => obsidian_plate_from_dust.json} | 0 ...late_1.json => peridot_plate_from_block.json} | 0 ...t_plate.json => peridot_plate_from_dust.json} | 0 .../compressor/{auto => }/platinum_plate.json | 0 ...ate_2.json => platinum_plate_from_block.json} | 0 ...e_1.json => red_garnet_plate_from_block.json} | 0 ...late.json => red_garnet_plate_from_dust.json} | 0 ...plate.json => redstone_plate_from_block.json} | 0 .../{auto => }/refined_iron_plate.json | 0 ...1.json => refined_iron_plate_from_block.json} | 0 ...y_plate_1.json => ruby_plate_from_block.json} | 0 ...ruby_plate.json => ruby_plate_from_dust.json} | 0 ...ate_1.json => sapphire_plate_from_block.json} | 0 ..._plate.json => sapphire_plate_from_dust.json} | 0 .../compressor/{auto => }/silver_plate.json | 0 ...plate_2.json => silver_plate_from_block.json} | 0 .../compressor/{auto => }/steel_plate.json | 0 ..._plate_2.json => steel_plate_from_block.json} | 0 .../recipes/compressor/{auto => }/tin_plate.json | 0 ...in_plate_2.json => tin_plate_from_block.json} | 0 .../compressor/{auto => }/titanium_plate.json | 0 ...ate_2.json => titanium_plate_from_block.json} | 0 .../compressor/{auto => }/tungsten_plate.json | 0 ...ate_2.json => tungsten_plate_from_block.json} | 0 .../{auto => }/tungstensteel_plate.json | 0 ....json => tungstensteel_plate_from_block.json} | 0 .../recipes/compressor/wood_plate.json | 2 +- ....json => yellow_garnet_plate_from_block.json} | 0 ...e.json => yellow_garnet_plate_from_dust.json} | 0 .../compressor/{auto => }/zinc_plate.json | 0 ...c_plate_2.json => zinc_plate_from_block.json} | 0 84 files changed, 5 insertions(+), 318 deletions(-) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/advanced_alloy_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/aluminum_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/aluminum_plate_2.json => aluminum_plate_from_block.json} (100%) delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json delete mode 100644 src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/brass_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/brass_plate_2.json => brass_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/bronze_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/bronze_plate_2.json => bronze_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/chrome_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/chrome_plate_2.json => chrome_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/coal_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/coal_plate_1.json => coal_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/copper_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/copper_plate_2.json => copper_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/diamond_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/diamond_plate_1.json => diamond_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/electrum_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/electrum_plate_2.json => electrum_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/emerald_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/emerald_plate_1.json => emerald_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/gold_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/gold_plate_2.json => gold_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/invar_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/invar_plate_2.json => invar_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/iron_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/iron_plate_2.json => iron_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/lapis_plate.json => lapis_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/lazurite_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/lead_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/lead_plate_2.json => lead_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/nickel_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/nickel_plate_2.json => nickel_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/obsidian_plate.json => obsidian_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/peridot_plate_1.json => peridot_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/peridot_plate.json => peridot_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/platinum_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/platinum_plate_2.json => platinum_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/red_garnet_plate_1.json => red_garnet_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/red_garnet_plate.json => red_garnet_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/redstone_plate.json => redstone_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/refined_iron_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/refined_iron_plate_1.json => refined_iron_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/ruby_plate_1.json => ruby_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/ruby_plate.json => ruby_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/sapphire_plate_1.json => sapphire_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/sapphire_plate.json => sapphire_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/silver_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/silver_plate_2.json => silver_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/steel_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/steel_plate_2.json => steel_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/tin_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/tin_plate_2.json => tin_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/titanium_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/titanium_plate_2.json => titanium_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/tungsten_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/tungsten_plate_2.json => tungsten_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/tungstensteel_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/tungstensteel_plate_1.json => tungstensteel_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/yellow_garnet_plate_1.json => yellow_garnet_plate_from_block.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/yellow_garnet_plate.json => yellow_garnet_plate_from_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto => }/zinc_plate.json (100%) rename src/main/resources/data/techreborn/recipes/compressor/{auto/zinc_plate_2.json => zinc_plate_from_block.json} (100%) diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 5249b52ff..24c395c7e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -49,10 +49,12 @@ public class ReiPlugin implements REIPluginEntry { public ReiPlugin() { iconMap.put(ModRecipes.ALLOY_SMELTER, Machine.ALLOY_SMELTER); - iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); iconMap.put(ModRecipes.BLAST_FURNACE, Machine.INDUSTRIAL_BLAST_FURNACE); iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE); iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR); + iconMap.put(ModRecipes.COMPRESSOR, Machine.COMPRESSOR); + iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); + //TODO add the others here } @@ -80,6 +82,7 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.BLAST_FURNACE.getName(), new ItemStack(Machine.INDUSTRIAL_BLAST_FURNACE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CENTRIFUGE.getName(), new ItemStack(Machine.INDUSTRIAL_CENTRIFUGE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CHEMICAL_REACTOR.getName(), new ItemStack(Machine.CHEMICAL_REACTOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.COMPRESSOR.getName(), new ItemStack(Machine.COMPRESSOR.asItem())); } private void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType recipeType){ diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/advanced_alloy_plate.json b/src/main/resources/data/techreborn/recipes/compressor/advanced_alloy_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/advanced_alloy_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/advanced_alloy_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/aluminum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/aluminum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/aluminum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/aluminum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json deleted file mode 100644 index 20ceaac85..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/aluminum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:aluminum_dust" - } - ], - "results": [ - { - "item": "techreborn:aluminum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json deleted file mode 100644 index a10cfd7c9..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:brass_dust" - } - ], - "results": [ - { - "item": "techreborn:brass_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json deleted file mode 100644 index 014a8cff9..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:bronze_dust" - } - ], - "results": [ - { - "item": "techreborn:bronze_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json deleted file mode 100644 index ed5657c51..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:chrome_dust" - } - ], - "results": [ - { - "item": "techreborn:chrome_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json deleted file mode 100644 index b5cc70ab5..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:copper_dust" - } - ], - "results": [ - { - "item": "techreborn:copper_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json deleted file mode 100644 index 759606f60..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:electrum_dust" - } - ], - "results": [ - { - "item": "techreborn:electrum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json deleted file mode 100644 index 4138c4d03..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:gold_dust" - } - ], - "results": [ - { - "item": "techreborn:gold_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json deleted file mode 100644 index b8a826f0b..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:invar_dust" - } - ], - "results": [ - { - "item": "techreborn:invar_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json deleted file mode 100644 index c7d47b950..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_alloy_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_alloy_ingot" - } - ], - "results": [ - { - "item": "techreborn:iridium_alloy_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json deleted file mode 100644 index 158953919..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_ingot" - } - ], - "results": [ - { - "item": "techreborn:iridium_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json deleted file mode 100644 index 1d908f61f..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iridium_plate_1.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 300, - "ingredients": [ - { - "item": "techreborn:iridium_storage_block" - } - ], - "results": [ - { - "item": "techreborn:iridium_plate", - "count": 9 - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json deleted file mode 100644 index 0873e6845..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:iron_dust" - } - ], - "results": [ - { - "item": "techreborn:iron_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json deleted file mode 100644 index 220e1212d..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:lead_dust" - } - ], - "results": [ - { - "item": "techreborn:lead_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json deleted file mode 100644 index 7d85048d3..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:nickel_dust" - } - ], - "results": [ - { - "item": "techreborn:nickel_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json deleted file mode 100644 index de445f232..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:platinum_dust" - } - ], - "results": [ - { - "item": "techreborn:platinum_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json deleted file mode 100644 index 450d3b4e6..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:silver_dust" - } - ], - "results": [ - { - "item": "techreborn:silver_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json deleted file mode 100644 index 844b086bf..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:steel_dust" - } - ], - "results": [ - { - "item": "techreborn:steel_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json deleted file mode 100644 index 99d340cad..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:tin_dust" - } - ], - "results": [ - { - "item": "techreborn:tin_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json deleted file mode 100644 index f05cf954d..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:titanium_dust" - } - ], - "results": [ - { - "item": "techreborn:titanium_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json deleted file mode 100644 index 199a827fd..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:tungsten_dust" - } - ], - "results": [ - { - "item": "techreborn:tungsten_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json deleted file mode 100644 index 317e4b859..000000000 --- a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_1.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "type": "techreborn:compressor", - "power": 10, - "time": 250, - "ingredients": [ - { - "item": "techreborn:zinc_dust" - } - ], - "results": [ - { - "item": "techreborn:zinc_plate" - } - ] -} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate.json b/src/main/resources/data/techreborn/recipes/compressor/brass_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/brass_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/brass_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/brass_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/brass_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate.json b/src/main/resources/data/techreborn/recipes/compressor/bronze_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/bronze_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/bronze_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/bronze_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/bronze_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/chrome_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate.json b/src/main/resources/data/techreborn/recipes/compressor/coal_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/coal_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/coal_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/coal_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/coal_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate.json b/src/main/resources/data/techreborn/recipes/compressor/copper_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/copper_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/copper_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/copper_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/copper_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate.json b/src/main/resources/data/techreborn/recipes/compressor/diamond_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/diamond_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/diamond_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/diamond_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/diamond_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/electrum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/electrum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/electrum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/electrum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/electrum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate.json b/src/main/resources/data/techreborn/recipes/compressor/emerald_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/emerald_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/emerald_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/emerald_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/emerald_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate.json b/src/main/resources/data/techreborn/recipes/compressor/gold_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/gold_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/gold_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/gold_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/gold_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate.json b/src/main/resources/data/techreborn/recipes/compressor/invar_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/invar_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/invar_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/invar_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/invar_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate.json b/src/main/resources/data/techreborn/recipes/compressor/iron_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/iron_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/iron_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/iron_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/iron_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lapis_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lapis_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lapis_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lapis_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lazurite_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lazurite_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lazurite_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lazurite_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate.json b/src/main/resources/data/techreborn/recipes/compressor/lead_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/lead_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/lead_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/lead_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/lead_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/nickel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/nickel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/nickel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/nickel_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/nickel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/obsidian_plate.json b/src/main/resources/data/techreborn/recipes/compressor/obsidian_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/obsidian_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/obsidian_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate.json b/src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/peridot_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/peridot_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate.json b/src/main/resources/data/techreborn/recipes/compressor/platinum_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/platinum_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/platinum_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/platinum_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/platinum_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate.json b/src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/red_garnet_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/red_garnet_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/redstone_plate.json b/src/main/resources/data/techreborn/recipes/compressor/redstone_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/redstone_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/redstone_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate.json b/src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/refined_iron_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/refined_iron_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate.json b/src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/ruby_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/ruby_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate.json b/src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/sapphire_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/sapphire_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate.json b/src/main/resources/data/techreborn/recipes/compressor/silver_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/silver_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/silver_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/silver_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/silver_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/steel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/steel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/steel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/steel_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/steel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tin_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tin_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/tin_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tin_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/tin_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/titanium_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/titanium_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/titanium_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/titanium_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/titanium_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tungsten_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tungsten_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/tungsten_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungsten_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/tungsten_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate.json b/src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/tungstensteel_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/tungstensteel_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json b/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json index 85d4826ca..4833f7ccb 100644 --- a/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json +++ b/src/main/resources/data/techreborn/recipes/compressor/wood_plate.json @@ -4,7 +4,7 @@ "time": 300, "ingredients": [ { - "item": "minecraft:oak_planks" + "tag": "minecraft:planks" } ], "results": [ diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate_1.json b/src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate_1.json rename to src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_block.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate.json b/src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/yellow_garnet_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/yellow_garnet_plate_from_dust.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate.json b/src/main/resources/data/techreborn/recipes/compressor/zinc_plate.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate.json rename to src/main/resources/data/techreborn/recipes/compressor/zinc_plate.json diff --git a/src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_2.json b/src/main/resources/data/techreborn/recipes/compressor/zinc_plate_from_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/compressor/auto/zinc_plate_2.json rename to src/main/resources/data/techreborn/recipes/compressor/zinc_plate_from_block.json From 4c8581ad49c6cb62b36dd26af05a4a7ae55ed2d1 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 2 Aug 2019 02:32:34 +0300 Subject: [PATCH 11/13] Grinder recipes review --- .../init/recipes/CompressorRecipes.java | 87 ------------------- src/main/java/techreborn/rei/ReiPlugin.java | 15 +++- .../recipes/compressor/iridium_plate.json | 15 ++++ .../compressor/iridium_plate_from_block.json | 16 ++++ .../grinder/{auto => }/aluminum_dust.json | 0 .../grinder/{auto => }/bauxite_dust.json | 0 .../grinder/{auto => }/brass_dust.json | 0 .../grinder/{auto => }/bronze_dust.json | 0 .../grinder/{auto => }/chrome_dust.json | 0 ..._dust.json => cinnabar_dust_from_ore.json} | 0 ...ust_1.json => copper_dust_from_ingot.json} | 0 ...er_dust.json => copper_dust_from_ore.json} | 0 .../recipes/grinder/diamond_dust.json | 15 ++++ .../grinder/{auto => }/electrum_dust.json | 0 .../recipes/grinder/emerald_dust.json | 15 ++++ .../grinder/{gravel.json => flint.json} | 0 .../grinder/{auto => }/galena_dust.json | 0 ..._dust_1.json => gold_dust_from_ingot.json} | 0 ...gold_dust.json => gold_dust_from_ore.json} | 0 .../grinder/{auto => }/invar_dust.json | 0 ..._dust_1.json => iron_dust_from_ingot.json} | 0 ...iron_dust.json => iron_dust_from_ore.json} | 0 .../{lapis_ore.json => lapis_lazuli.json} | 0 ..._dust_1.json => lead_dust_from_ingot.json} | 0 ...lead_dust.json => lead_dust_from_ore.json} | 0 ..._dust.json => nickel_dust_from_ingot.json} | 0 ...dust_1.json => peridot_dust_from_gem.json} | 0 ...t_dust.json => peridot_dust_from_ore.json} | 0 .../grinder/{auto => }/platinum_dust.json | 0 .../recipes/grinder/prismarine_crystals.json | 15 ++++ ...te_dust.json => pyrite_dust_from_ore.json} | 0 ...ust.json => red_garnet_dust_from_gem.json} | 0 ...by_dust_1.json => ruby_dust_from_gem.json} | 0 ...ruby_dust.json => ruby_dust_from_ore.json} | 0 .../grinder/{cobblestone.json => sand.json} | 0 ...ust_1.json => sapphire_dust_from_gem.json} | 0 ..._dust.json => sapphire_dust_from_ore.json} | 0 ...ust_1.json => silver_dust_from_ingot.json} | 0 ...er_dust.json => silver_dust_from_ore.json} | 0 ..._dust.json => sodalite_dust_from_ore.json} | 0 ...ust.json => sphalerite_dust_from_ore.json} | 0 .../grinder/{auto => }/steel_dust.json | 0 ...n_dust_1.json => tin_dust_from_ingot.json} | 0 .../tin_dust.json => tin_dust_from_ore.json} | 0 .../grinder/{auto => }/titanium_dust.json | 0 .../grinder/{auto => }/tungsten_dust.json | 0 ....json => yellow_garnet_dust_from_gem.json} | 0 .../recipes/grinder/{auto => }/zinc_dust.json | 0 48 files changed, 88 insertions(+), 90 deletions(-) delete mode 100644 src/main/java/techreborn/init/recipes/CompressorRecipes.java create mode 100644 src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json create mode 100644 src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/aluminum_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/bauxite_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/brass_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/bronze_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/chrome_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/cinnabar_dust.json => cinnabar_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/copper_dust_1.json => copper_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/copper_dust.json => copper_dust_from_ore.json} (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/electrum_dust.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json rename src/main/resources/data/techreborn/recipes/grinder/{gravel.json => flint.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/galena_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/gold_dust_1.json => gold_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/gold_dust.json => gold_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/invar_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/iron_dust_1.json => iron_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/iron_dust.json => iron_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{lapis_ore.json => lapis_lazuli.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/lead_dust_1.json => lead_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/lead_dust.json => lead_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/nickel_dust.json => nickel_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/peridot_dust_1.json => peridot_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/peridot_dust.json => peridot_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/platinum_dust.json (100%) create mode 100644 src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json rename src/main/resources/data/techreborn/recipes/grinder/{auto/pyrite_dust.json => pyrite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/red_garnet_dust.json => red_garnet_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/ruby_dust_1.json => ruby_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/ruby_dust.json => ruby_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{cobblestone.json => sand.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sapphire_dust_1.json => sapphire_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sapphire_dust.json => sapphire_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/silver_dust_1.json => silver_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/silver_dust.json => silver_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sodalite_dust.json => sodalite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/sphalerite_dust.json => sphalerite_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/steel_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/tin_dust_1.json => tin_dust_from_ingot.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/tin_dust.json => tin_dust_from_ore.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/titanium_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/tungsten_dust.json (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto/yellow_garnet_dust.json => yellow_garnet_dust_from_gem.json} (100%) rename src/main/resources/data/techreborn/recipes/grinder/{auto => }/zinc_dust.json (100%) diff --git a/src/main/java/techreborn/init/recipes/CompressorRecipes.java b/src/main/java/techreborn/init/recipes/CompressorRecipes.java deleted file mode 100644 index e60b5c511..000000000 --- a/src/main/java/techreborn/init/recipes/CompressorRecipes.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * This file is part of TechReborn, licensed under the MIT License (MIT). - * - * Copyright (c) 2018 TechReborn - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -package techreborn.init.recipes; - -import net.minecraft.item.ItemStack; - - -/** - * @author drcrazy - * - */ -public class CompressorRecipes extends RecipeMethods { - - public static void init() { -// register(ItemIngots.getIngotByName("advanced_alloy"), ItemPlates.getPlateByName("advanced_alloy"), 400, 20); -// register(IC2Duplicates.CARBON_MESH.getStackBasedOnConfig(), ItemPlates.getPlateByName("carbon"), 400, 2); -// register(OreUtil.getStackFromName("plankWood"), OreUtil.getStackFromName("plateWood")); -// register(OreUtil.getStackFromName("dustLazurite"), ItemPlates.getPlateByName("lazurite")); -// register(OreUtil.getStackFromName("obsidian"), ItemPlates.getPlateByName("obsidian", 9)); -// register(OreUtil.getStackFromName("dustObsidian"), ItemPlates.getPlateByName("obsidian")); -// register(OreUtil.getStackFromName("dustYellowGarnet"), ItemPlates.getPlateByName("YellowGarnet")); -// register(OreUtil.getStackFromName("blockYellowGarnet"), ItemPlates.getPlateByName("YellowGarnet", 9)); -// register(OreUtil.getStackFromName("dustRedGarnet"), ItemPlates.getPlateByName("RedGarnet")); -// register(OreUtil.getStackFromName("blockRedGarnet"), ItemPlates.getPlateByName("RedGarnet", 9)); -// register("ingotRefinedIron", ItemPlates.getPlateByName("RefinedIron")); -// -// ItemStack plate; -// for (String ore : OreUtil.oreNames) { -// if (ore.equals("iridium")) { -// continue; -// } -// if (!OreUtil.hasPlate(ore)) { -// continue; -// } -// -// try { -// plate = ItemPlates.getPlateByName(ore, 1); -// } catch (InvalidParameterException e) { -// plate = OreUtil.getStackFromName("plate" + OreUtil.capitalizeFirstLetter(ore)); -// } -// if (plate.isEmpty()) { -// continue; -// } -// if (OreUtil.hasIngot(ore)) { -// register(OreUtil.getStackFromName("ingot" + OreUtil.capitalizeFirstLetter(ore)), plate); -// } -// if (OreUtil.hasGem(ore) && OreUtil.hasDust(ore)) { -// register(OreUtil.getStackFromName("dust" + OreUtil.capitalizeFirstLetter(ore)), plate); -// } -// if (OreUtil.hasBlock(ore)) { -// ItemStack morePlates = plate.copy(); -// morePlates.setCount(9); -// register(OreUtil.getStackFromName("block" + OreUtil.capitalizeFirstLetter(ore)), morePlates); -// } -// } - } - - static void register(Object input, ItemStack output) { - register(input, output, 300, 4); - } - - static void register(Object input, ItemStack output, int tickTime, int euPerTick) { - //RecipeHandler.addRecipe(new CompressorRecipe(input, output, tickTime, euPerTick)); - } -} diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 24c395c7e..65c91fd1e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -53,9 +53,12 @@ public class ReiPlugin implements REIPluginEntry { iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE); iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR); iconMap.put(ModRecipes.COMPRESSOR, Machine.COMPRESSOR); + iconMap.put(ModRecipes.DISTILLATION_TOWER, Machine.DISTILLATION_TOWER); + iconMap.put(ModRecipes.EXTRACTOR, Machine.EXTRACTOR); iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); - - //TODO add the others here + iconMap.put(ModRecipes.IMPLOSION_COMPRESSOR, Machine.IMPLOSION_COMPRESSOR); + iconMap.put(ModRecipes.INDUSTRIAL_SAWMILL, Machine.INDUSTRIAL_SAWMILL); + iconMap.put(ModRecipes.VACUUM_FREEZER, Machine.VACUUM_FREEZER); } @Override @@ -78,11 +81,17 @@ public class ReiPlugin implements REIPluginEntry { recipeHelper.registerWorkingStations(ModRecipes.ALLOY_SMELTER.getName(), new ItemStack[] { new ItemStack(Machine.ALLOY_SMELTER.asItem()), new ItemStack(Machine.IRON_ALLOY_FURNACE.asItem())}); - recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.BLAST_FURNACE.getName(), new ItemStack(Machine.INDUSTRIAL_BLAST_FURNACE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CENTRIFUGE.getName(), new ItemStack(Machine.INDUSTRIAL_CENTRIFUGE.asItem())); recipeHelper.registerWorkingStations(ModRecipes.CHEMICAL_REACTOR.getName(), new ItemStack(Machine.CHEMICAL_REACTOR.asItem())); recipeHelper.registerWorkingStations(ModRecipes.COMPRESSOR.getName(), new ItemStack(Machine.COMPRESSOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.DISTILLATION_TOWER.getName(), new ItemStack(Machine.DISTILLATION_TOWER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.EXTRACTOR.getName(), new ItemStack(Machine.EXTRACTOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.GRINDER.getName(), new ItemStack(Machine.GRINDER.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.IMPLOSION_COMPRESSOR.getName(), new ItemStack(Machine.IMPLOSION_COMPRESSOR.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.INDUSTRIAL_SAWMILL.getName(), new ItemStack(Machine.INDUSTRIAL_SAWMILL.asItem())); + recipeHelper.registerWorkingStations(ModRecipes.VACUUM_FREEZER.getName(), new ItemStack(Machine.VACUUM_FREEZER.asItem())); } private void registerMachineRecipe(RecipeHelper recipeHelper, RebornRecipeType recipeType){ diff --git a/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json new file mode 100644 index 000000000..158953919 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:iridium_ingot" + } + ], + "results": [ + { + "item": "techreborn:iridium_plate" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json new file mode 100644 index 000000000..1d908f61f --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/compressor/iridium_plate_from_block.json @@ -0,0 +1,16 @@ +{ + "type": "techreborn:compressor", + "power": 10, + "time": 300, + "ingredients": [ + { + "item": "techreborn:iridium_storage_block" + } + ], + "results": [ + { + "item": "techreborn:iridium_plate", + "count": 9 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/aluminum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/aluminum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/aluminum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/aluminum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/bauxite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/bauxite_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/bauxite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/bauxite_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/brass_dust.json b/src/main/resources/data/techreborn/recipes/grinder/brass_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/brass_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/brass_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/bronze_dust.json b/src/main/resources/data/techreborn/recipes/grinder/bronze_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/bronze_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/bronze_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/chrome_dust.json b/src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/chrome_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/cinnabar_dust.json b/src/main/resources/data/techreborn/recipes/grinder/cinnabar_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/cinnabar_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/cinnabar_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust.json b/src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/copper_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/copper_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json b/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json new file mode 100644 index 000000000..a7ac24bdb --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/diamond_dust.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 30, + "time": 270, + "ingredients": [ + { + "item": "minecraft:diamond" + } + ], + "results": [ + { + "item": "techreborn:diamond_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/electrum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/electrum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/electrum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/electrum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json b/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json new file mode 100644 index 000000000..3630082fd --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/emerald_dust.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 30, + "time": 270, + "ingredients": [ + { + "item": "minecraft:emerald" + } + ], + "results": [ + { + "item": "techreborn:emerald_dust" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/gravel.json b/src/main/resources/data/techreborn/recipes/grinder/flint.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/gravel.json rename to src/main/resources/data/techreborn/recipes/grinder/flint.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/galena_dust.json b/src/main/resources/data/techreborn/recipes/grinder/galena_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/galena_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/galena_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust.json b/src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/gold_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/gold_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/invar_dust.json b/src/main/resources/data/techreborn/recipes/grinder/invar_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/invar_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/invar_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust.json b/src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/iron_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/iron_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/lapis_ore.json b/src/main/resources/data/techreborn/recipes/grinder/lapis_lazuli.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/lapis_ore.json rename to src/main/resources/data/techreborn/recipes/grinder/lapis_lazuli.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust.json b/src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/lead_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/lead_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/nickel_dust.json b/src/main/resources/data/techreborn/recipes/grinder/nickel_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/nickel_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/nickel_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust.json b/src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/peridot_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/peridot_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/platinum_dust.json b/src/main/resources/data/techreborn/recipes/grinder/platinum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/platinum_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/platinum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json new file mode 100644 index 000000000..c1939d1b9 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/grinder/prismarine_crystals.json @@ -0,0 +1,15 @@ +{ + "type": "techreborn:grinder", + "power": 200, + "time": 22, + "ingredients": [ + { + "item": "minecraft:prismarine_shard" + } + ], + "results": [ + { + "item": "minecraft:prismarine_crystals" + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/pyrite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/pyrite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/pyrite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/pyrite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/red_garnet_dust.json b/src/main/resources/data/techreborn/recipes/grinder/red_garnet_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/red_garnet_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/red_garnet_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust.json b/src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/ruby_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/ruby_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/cobblestone.json b/src/main/resources/data/techreborn/recipes/grinder/sand.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/cobblestone.json rename to src/main/resources/data/techreborn/recipes/grinder/sand.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sapphire_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sapphire_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust.json b/src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/silver_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/silver_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sodalite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sodalite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sodalite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sodalite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/sphalerite_dust.json b/src/main/resources/data/techreborn/recipes/grinder/sphalerite_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/sphalerite_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/sphalerite_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/steel_dust.json b/src/main/resources/data/techreborn/recipes/grinder/steel_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/steel_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/steel_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust_1.json b/src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ingot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust_1.json rename to src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ingot.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust.json b/src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ore.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tin_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/tin_dust_from_ore.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/titanium_dust.json b/src/main/resources/data/techreborn/recipes/grinder/titanium_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/titanium_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/titanium_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/tungsten_dust.json b/src/main/resources/data/techreborn/recipes/grinder/tungsten_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/tungsten_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/tungsten_dust.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/yellow_garnet_dust.json b/src/main/resources/data/techreborn/recipes/grinder/yellow_garnet_dust_from_gem.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/yellow_garnet_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/yellow_garnet_dust_from_gem.json diff --git a/src/main/resources/data/techreborn/recipes/grinder/auto/zinc_dust.json b/src/main/resources/data/techreborn/recipes/grinder/zinc_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/grinder/auto/zinc_dust.json rename to src/main/resources/data/techreborn/recipes/grinder/zinc_dust.json From 8c0a3b319778c3cd5219cb2944504df5b4753874 Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 2 Aug 2019 11:26:38 +0300 Subject: [PATCH 12/13] Review of Industrial centrifuge recipes --- .../enchanted_golden_apple.json} | 0 .../recipes/blast_furnace/silicon_plate.json | 22 +++++++++++++++++++ .../{auto/carbon.json => ahes_dust.json} | 0 .../{auto/methane.json => apple.json} | 0 .../methane_24.json => baked_potato.json} | 0 .../peridot_dust.json => basalt_dust.json} | 0 .../{auto/methane_5.json => beef.json} | 0 .../{auto/methane_25.json => beetroot.json} | 0 ...pper_small_dust_1.json => brass_dust.json} | 0 .../{auto/methane_2.json => bread.json} | 0 ...opper_small_dust.json => bronze_dust.json} | 0 .../methane_29.json => brown_mushroom.json} | 0 ...hane_27.json => brown_mushroom_block.json} | 0 ...e_dust.json => calciumcarbonate_cell.json} | 0 .../{auto/methane_21.json => carrot.json} | 0 .../{auto/methane_7.json => chicken.json} | 0 .../{auto/methane_13.json => cod.json} | 0 .../{auto/methane_6.json => cooked_beef.json} | 0 .../methane_8.json => cooked_chicken.json} | 0 .../{auto/methane_14.json => cooked_cod.json} | 0 .../methane_10.json => cooked_mutton.json} | 0 .../methane_4.json => cooked_porkchop.json} | 0 .../methane_12.json => cooked_rabbit.json} | 0 .../methane_16.json => cooked_salmon.json} | 0 .../{auto/methane_26.json => cookie.json} | 0 ...old_small_dust_1.json => copper_dust.json} | 0 .../ashes_dust.json => dark_ashes_dust.json} | 0 .../tritium.json => deuterium_cell.json} | 0 .../centrifuge/{auto/sand.json => dirt.json} | 0 ...old_small_dust.json => electrum_dust.json} | 0 ...er_pearl_dust.json => ender_eye_dust.json} | 0 .../{auto/helium3.json => endstone_dust.json} | 0 ...get_1.json => glistering_melon_slice.json} | 0 .../redstone.json => glowstone_dust.json} | 0 ...opper_small_dust_2.json => gold_dust.json} | 0 .../gold_ingot.json => golden_apple.json} | 0 .../gold_nugget.json => golden_carrot.json} | 0 .../{auto/sand_1.json => grass_block.json} | 2 +- .../{auto/helium3_1.json => helium_cell.json} | 0 .../deuterium.json => hydrogen_cell.json} | 0 .../tin_small_dust.json => iron_dust.json} | 0 .../lazurite_dust.json => lapis_lazuli.json} | 0 .../{auto/tin_ingot.json => lava_cell.json} | 0 .../silver_small_dust.json => lead_dust.json} | 0 .../magnesium_dust.json => marble_dust.json} | 0 .../methane_17.json => melon_slice.json} | 0 .../methane_1.json => mushroom_stew.json} | 0 .../{auto/methane_9.json => mutton.json} | 0 .../{auto/sand_2.json => mycelium.json} | 0 .../methane_31.json => nether_wart.json} | 0 .../redstone_1.json => netherrack_dust.json} | 0 .../iron_small_dust.json => nickel_dust.json} | 0 ...iridium_nugget.json => platinum_dust.json} | 0 .../methane_23.json => poisonous_potato.json} | 0 .../{auto/methane_3.json => porkchop.json} | 0 .../{auto/methane_22.json => potato.json} | 0 .../{auto/methane_18.json => pumpkin.json} | 0 .../{auto/methane_11.json => rabbit.json} | 0 .../pyrope_dust.json => red_garnet_dust.json} | 0 .../methane_30.json => red_mushroom.json} | 0 ...ethane_28.json => red_mushroom_block.json} | 0 .../{auto/silicon.json => redstone.json} | 0 .../methane_19.json => rotten_flesh.json} | 0 .../{auto/sap.json => rubber_log.json} | 0 .../{auto/methane_15.json => salmon.json} | 0 .../centrifuge/{auto/rubber.json => sap.json} | 0 .../lead_small_dust.json => silver_dust.json} | 0 .../{auto/sand_3.json => soul_sand.json} | 0 .../{auto/methane_20.json => spider_eye.json} | 0 .../sulfur_dust.json => sulfur_cell.json} | 0 .../zinc_small_dust.json => tin_dust.json} | 0 ...dite_dust.json => yellow_garnet_dust.json} | 0 .../tin_small_dust_1.json => zinc_dust.json} | 0 73 files changed, 23 insertions(+), 1 deletion(-) rename src/main/resources/data/techreborn/recipes/{centrifuge/auto/gold_ingot_1.json => blast_furnace/enchanted_golden_apple.json} (100%) create mode 100644 src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/carbon.json => ahes_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane.json => apple.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_24.json => baked_potato.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/peridot_dust.json => basalt_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_5.json => beef.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_25.json => beetroot.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/copper_small_dust_1.json => brass_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_2.json => bread.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/copper_small_dust.json => bronze_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_29.json => brown_mushroom.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_27.json => brown_mushroom_block.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/calcite_dust.json => calciumcarbonate_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_21.json => carrot.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_7.json => chicken.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_13.json => cod.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_6.json => cooked_beef.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_8.json => cooked_chicken.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_14.json => cooked_cod.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_10.json => cooked_mutton.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_4.json => cooked_porkchop.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_12.json => cooked_rabbit.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_16.json => cooked_salmon.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_26.json => cookie.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/gold_small_dust_1.json => copper_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/ashes_dust.json => dark_ashes_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/tritium.json => deuterium_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sand.json => dirt.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/gold_small_dust.json => electrum_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/ender_pearl_dust.json => ender_eye_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/helium3.json => endstone_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/gold_nugget_1.json => glistering_melon_slice.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/redstone.json => glowstone_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/copper_small_dust_2.json => gold_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/gold_ingot.json => golden_apple.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/gold_nugget.json => golden_carrot.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sand_1.json => grass_block.json} (90%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/helium3_1.json => helium_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/deuterium.json => hydrogen_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/tin_small_dust.json => iron_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/lazurite_dust.json => lapis_lazuli.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/tin_ingot.json => lava_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/silver_small_dust.json => lead_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/magnesium_dust.json => marble_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_17.json => melon_slice.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_1.json => mushroom_stew.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_9.json => mutton.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sand_2.json => mycelium.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_31.json => nether_wart.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/redstone_1.json => netherrack_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/iron_small_dust.json => nickel_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/iridium_nugget.json => platinum_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_23.json => poisonous_potato.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_3.json => porkchop.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_22.json => potato.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_18.json => pumpkin.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_11.json => rabbit.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/pyrope_dust.json => red_garnet_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_30.json => red_mushroom.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_28.json => red_mushroom_block.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/silicon.json => redstone.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_19.json => rotten_flesh.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sap.json => rubber_log.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_15.json => salmon.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/rubber.json => sap.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/lead_small_dust.json => silver_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sand_3.json => soul_sand.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/methane_20.json => spider_eye.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/sulfur_dust.json => sulfur_cell.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/zinc_small_dust.json => tin_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/andradite_dust.json => yellow_garnet_dust.json} (100%) rename src/main/resources/data/techreborn/recipes/centrifuge/{auto/tin_small_dust_1.json => zinc_dust.json} (100%) diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json b/src/main/resources/data/techreborn/recipes/blast_furnace/enchanted_golden_apple.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot_1.json rename to src/main/resources/data/techreborn/recipes/blast_furnace/enchanted_golden_apple.json diff --git a/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json b/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json new file mode 100644 index 000000000..bd47035d4 --- /dev/null +++ b/src/main/resources/data/techreborn/recipes/blast_furnace/silicon_plate.json @@ -0,0 +1,22 @@ +{ + "type": "techreborn:blast_furnace", + "power": 128, + "time": 1000, + "heat": 1500, + "ingredients": [ + { + "fluid": "techreborn:calciumcarbonate", + "holder": "techreborn:cell", + "count": 2 + } + ], + "results": [ + { + "item": "techreborn:silicon_plate" + }, + { + "item": "techreborn:cell", + "count": 2 + } + ] +} diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json b/src/main/resources/data/techreborn/recipes/centrifuge/ahes_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/carbon.json rename to src/main/resources/data/techreborn/recipes/centrifuge/ahes_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json b/src/main/resources/data/techreborn/recipes/centrifuge/apple.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane.json rename to src/main/resources/data/techreborn/recipes/centrifuge/apple.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json b/src/main/resources/data/techreborn/recipes/centrifuge/baked_potato.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_24.json rename to src/main/resources/data/techreborn/recipes/centrifuge/baked_potato.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/basalt_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/peridot_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/basalt_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json b/src/main/resources/data/techreborn/recipes/centrifuge/beef.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_5.json rename to src/main/resources/data/techreborn/recipes/centrifuge/beef.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json b/src/main/resources/data/techreborn/recipes/centrifuge/beetroot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_25.json rename to src/main/resources/data/techreborn/recipes/centrifuge/beetroot.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/brass_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/brass_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/bread.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_2.json rename to src/main/resources/data/techreborn/recipes/centrifuge/bread.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/bronze_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/bronze_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json b/src/main/resources/data/techreborn/recipes/centrifuge/brown_mushroom.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_29.json rename to src/main/resources/data/techreborn/recipes/centrifuge/brown_mushroom.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json b/src/main/resources/data/techreborn/recipes/centrifuge/brown_mushroom_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_27.json rename to src/main/resources/data/techreborn/recipes/centrifuge/brown_mushroom_block.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/calcite_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/calciumcarbonate_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json b/src/main/resources/data/techreborn/recipes/centrifuge/carrot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_21.json rename to src/main/resources/data/techreborn/recipes/centrifuge/carrot.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json b/src/main/resources/data/techreborn/recipes/centrifuge/chicken.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_7.json rename to src/main/resources/data/techreborn/recipes/centrifuge/chicken.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json b/src/main/resources/data/techreborn/recipes/centrifuge/cod.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_13.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cod.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_6.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_beef.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_8.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_chicken.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_cod.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_14.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_cod.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_10.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_mutton.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_4.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_porkchop.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_12.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_rabbit.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json b/src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_16.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cooked_salmon.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json b/src/main/resources/data/techreborn/recipes/centrifuge/cookie.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_26.json rename to src/main/resources/data/techreborn/recipes/centrifuge/cookie.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/copper_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/copper_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/dark_ashes_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/ashes_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/dark_ashes_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json b/src/main/resources/data/techreborn/recipes/centrifuge/deuterium_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/tritium.json rename to src/main/resources/data/techreborn/recipes/centrifuge/deuterium_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json b/src/main/resources/data/techreborn/recipes/centrifuge/dirt.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sand.json rename to src/main/resources/data/techreborn/recipes/centrifuge/dirt.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/electrum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/ender_eye_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/ender_pearl_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/ender_eye_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json b/src/main/resources/data/techreborn/recipes/centrifuge/endstone_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3.json rename to src/main/resources/data/techreborn/recipes/centrifuge/endstone_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/glistering_melon_slice.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/glistering_melon_slice.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json b/src/main/resources/data/techreborn/recipes/centrifuge/glowstone_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone.json rename to src/main/resources/data/techreborn/recipes/centrifuge/glowstone_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/gold_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/copper_small_dust_2.json rename to src/main/resources/data/techreborn/recipes/centrifuge/gold_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json b/src/main/resources/data/techreborn/recipes/centrifuge/golden_apple.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_ingot.json rename to src/main/resources/data/techreborn/recipes/centrifuge/golden_apple.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json b/src/main/resources/data/techreborn/recipes/centrifuge/golden_carrot.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/gold_nugget.json rename to src/main/resources/data/techreborn/recipes/centrifuge/golden_carrot.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json similarity index 90% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json index 1b879b4e0..3a2ad54b1 100644 --- a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_1.json +++ b/src/main/resources/data/techreborn/recipes/centrifuge/grass_block.json @@ -4,7 +4,7 @@ "time": 5, "ingredients": [ { - "item": "minecraft:grass", + "item": "minecraft:grass_block", "count": 16 } ], diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/helium_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/helium3_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/helium_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json b/src/main/resources/data/techreborn/recipes/centrifuge/hydrogen_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/deuterium.json rename to src/main/resources/data/techreborn/recipes/centrifuge/hydrogen_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/iron_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/iron_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/lapis_lazuli.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/lazurite_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/lapis_lazuli.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json b/src/main/resources/data/techreborn/recipes/centrifuge/lava_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_ingot.json rename to src/main/resources/data/techreborn/recipes/centrifuge/lava_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/lead_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/silver_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/lead_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/marble_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/magnesium_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/marble_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json b/src/main/resources/data/techreborn/recipes/centrifuge/melon_slice.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_17.json rename to src/main/resources/data/techreborn/recipes/centrifuge/melon_slice.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/mushroom_stew.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/mushroom_stew.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json b/src/main/resources/data/techreborn/recipes/centrifuge/mutton.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_9.json rename to src/main/resources/data/techreborn/recipes/centrifuge/mutton.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json b/src/main/resources/data/techreborn/recipes/centrifuge/mycelium.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_2.json rename to src/main/resources/data/techreborn/recipes/centrifuge/mycelium.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json b/src/main/resources/data/techreborn/recipes/centrifuge/nether_wart.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_31.json rename to src/main/resources/data/techreborn/recipes/centrifuge/nether_wart.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/netherrack_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/redstone_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/netherrack_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/nickel_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/iron_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/nickel_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json b/src/main/resources/data/techreborn/recipes/centrifuge/platinum_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/iridium_nugget.json rename to src/main/resources/data/techreborn/recipes/centrifuge/platinum_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json b/src/main/resources/data/techreborn/recipes/centrifuge/poisonous_potato.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_23.json rename to src/main/resources/data/techreborn/recipes/centrifuge/poisonous_potato.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json b/src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_3.json rename to src/main/resources/data/techreborn/recipes/centrifuge/porkchop.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json b/src/main/resources/data/techreborn/recipes/centrifuge/potato.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_22.json rename to src/main/resources/data/techreborn/recipes/centrifuge/potato.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json b/src/main/resources/data/techreborn/recipes/centrifuge/pumpkin.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_18.json rename to src/main/resources/data/techreborn/recipes/centrifuge/pumpkin.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json b/src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_11.json rename to src/main/resources/data/techreborn/recipes/centrifuge/rabbit.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/red_garnet_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/pyrope_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/red_garnet_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json b/src/main/resources/data/techreborn/recipes/centrifuge/red_mushroom.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_30.json rename to src/main/resources/data/techreborn/recipes/centrifuge/red_mushroom.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json b/src/main/resources/data/techreborn/recipes/centrifuge/red_mushroom_block.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_28.json rename to src/main/resources/data/techreborn/recipes/centrifuge/red_mushroom_block.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json b/src/main/resources/data/techreborn/recipes/centrifuge/redstone.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/silicon.json rename to src/main/resources/data/techreborn/recipes/centrifuge/redstone.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json b/src/main/resources/data/techreborn/recipes/centrifuge/rotten_flesh.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_19.json rename to src/main/resources/data/techreborn/recipes/centrifuge/rotten_flesh.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json b/src/main/resources/data/techreborn/recipes/centrifuge/rubber_log.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sap.json rename to src/main/resources/data/techreborn/recipes/centrifuge/rubber_log.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json b/src/main/resources/data/techreborn/recipes/centrifuge/salmon.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_15.json rename to src/main/resources/data/techreborn/recipes/centrifuge/salmon.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json b/src/main/resources/data/techreborn/recipes/centrifuge/sap.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/rubber.json rename to src/main/resources/data/techreborn/recipes/centrifuge/sap.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/silver_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/lead_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/silver_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json b/src/main/resources/data/techreborn/recipes/centrifuge/soul_sand.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sand_3.json rename to src/main/resources/data/techreborn/recipes/centrifuge/soul_sand.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json b/src/main/resources/data/techreborn/recipes/centrifuge/spider_eye.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/methane_20.json rename to src/main/resources/data/techreborn/recipes/centrifuge/spider_eye.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/sulfur_cell.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/sulfur_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/sulfur_cell.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/tin_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/zinc_small_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/tin_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json b/src/main/resources/data/techreborn/recipes/centrifuge/yellow_garnet_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/andradite_dust.json rename to src/main/resources/data/techreborn/recipes/centrifuge/yellow_garnet_dust.json diff --git a/src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json b/src/main/resources/data/techreborn/recipes/centrifuge/zinc_dust.json similarity index 100% rename from src/main/resources/data/techreborn/recipes/centrifuge/auto/tin_small_dust_1.json rename to src/main/resources/data/techreborn/recipes/centrifuge/zinc_dust.json From cae663cc6c24dd02b5c8c72e35af5a5ecb5a0bcc Mon Sep 17 00:00:00 2001 From: drcrazy Date: Fri, 2 Aug 2019 15:04:03 +0300 Subject: [PATCH 13/13] More icons in REI --- src/main/java/techreborn/rei/ReiPlugin.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/techreborn/rei/ReiPlugin.java b/src/main/java/techreborn/rei/ReiPlugin.java index 65c91fd1e..54bc41b0e 100644 --- a/src/main/java/techreborn/rei/ReiPlugin.java +++ b/src/main/java/techreborn/rei/ReiPlugin.java @@ -35,6 +35,7 @@ import reborncore.common.crafting.RebornRecipeType; import reborncore.common.crafting.RecipeManager; import techreborn.TechReborn; import techreborn.init.ModRecipes; +import techreborn.init.TRContent; import techreborn.init.TRContent.Machine; import java.util.HashMap; @@ -49,15 +50,20 @@ public class ReiPlugin implements REIPluginEntry { public ReiPlugin() { iconMap.put(ModRecipes.ALLOY_SMELTER, Machine.ALLOY_SMELTER); + iconMap.put(ModRecipes.ASSEMBLING_MACHINE,Machine.ASSEMBLY_MACHINE); iconMap.put(ModRecipes.BLAST_FURNACE, Machine.INDUSTRIAL_BLAST_FURNACE); iconMap.put(ModRecipes.CENTRIFUGE, Machine.INDUSTRIAL_CENTRIFUGE); iconMap.put(ModRecipes.CHEMICAL_REACTOR, Machine.CHEMICAL_REACTOR); iconMap.put(ModRecipes.COMPRESSOR, Machine.COMPRESSOR); iconMap.put(ModRecipes.DISTILLATION_TOWER, Machine.DISTILLATION_TOWER); iconMap.put(ModRecipes.EXTRACTOR, Machine.EXTRACTOR); + iconMap.put(ModRecipes.FLUID_REPLICATOR, Machine.FLUID_REPLICATOR); iconMap.put(ModRecipes.GRINDER, Machine.GRINDER); iconMap.put(ModRecipes.IMPLOSION_COMPRESSOR, Machine.IMPLOSION_COMPRESSOR); + iconMap.put(ModRecipes.INDUSTRIAL_ELECTROLYZER, Machine.INDUSTRIAL_ELECTROLYZER); + iconMap.put(ModRecipes.INDUSTRIAL_GRINDER, Machine.INDUSTRIAL_GRINDER); iconMap.put(ModRecipes.INDUSTRIAL_SAWMILL, Machine.INDUSTRIAL_SAWMILL); + iconMap.put(ModRecipes.SCRAPBOX, TRContent.SCRAP_BOX); iconMap.put(ModRecipes.VACUUM_FREEZER, Machine.VACUUM_FREEZER); }