From 255f277304ec39a310175c5d5222db8144e78ede Mon Sep 17 00:00:00 2001 From: drcrazy Date: Thu, 1 Aug 2019 14:34:43 +0300 Subject: [PATCH] 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