diff --git a/src/main/java/vazkii/botania/client/model/DelegatedModel.java b/src/main/java/vazkii/botania/client/model/DelegatedModel.java new file mode 100644 index 000000000..057ec706b --- /dev/null +++ b/src/main/java/vazkii/botania/client/model/DelegatedModel.java @@ -0,0 +1,108 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.client.model; + +import com.mojang.blaze3d.matrix.MatrixStack; + +import net.minecraft.block.BlockState; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.util.Direction; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.ILightReader; +import net.minecraftforge.client.model.data.IModelData; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +import java.util.List; +import java.util.Random; + +public class DelegatedModel implements IBakedModel { + protected final IBakedModel originalModel; + + public DelegatedModel(IBakedModel originalModel) { + this.originalModel = originalModel; + } + + @Override + public boolean isAmbientOcclusion() { + return originalModel.isAmbientOcclusion(); + } + + @Override + public boolean isAmbientOcclusion(BlockState state) { + return originalModel.isAmbientOcclusion(state); + } + + @Override + public boolean isGui3d() { + return originalModel.isGui3d(); + } + + @Override + public boolean func_230044_c_() { + return originalModel.func_230044_c_(); + } + + @Override + public boolean isBuiltInRenderer() { + return originalModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() { + return originalModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() { + return originalModel.getItemCameraTransforms(); + } + + @Override + public ItemOverrideList getOverrides() { + return originalModel.getOverrides(); + } + + @Override + public boolean doesHandlePerspectives() { + return originalModel.doesHandlePerspectives(); + } + + @Override + public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { + return originalModel.handlePerspective(cameraTransformType, mat); + } + + @Override + public TextureAtlasSprite getParticleTexture(@Nonnull IModelData data) { + return originalModel.getParticleTexture(data); + } + + @Nonnull + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, @Nonnull Random rand, @Nonnull IModelData extraData) { + return originalModel.getQuads(state, side, rand, extraData); + } + + @Nonnull + @Override + public IModelData getModelData(@Nonnull ILightReader world, @Nonnull BlockPos pos, @Nonnull BlockState state, @Nonnull IModelData tileData) { + return originalModel.getModelData(world, pos, state, tileData); + } + + @Override + public List getQuads(@Nullable BlockState state, @Nullable Direction side, Random rand) { + return null; + } +} diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index f90e21b43..c32cde457 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -74,7 +74,7 @@ public class FloatingFlowerModel implements IModelGeometry return new Baked(bakedFlower, bakedIslands); } - public static class Baked extends BakedModelWrapper { + public static class Baked extends DelegatedModel { private final Map> genQuads = new HashMap<>(); private final Map>> faceQuads = new HashMap<>(); diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index f4c4a2df2..efecb80ba 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -124,7 +124,7 @@ public class GunModel implements IBakedModel { return cache.computeIfAbsent(Pair.of(lens.getItem(), clip), p -> new CompositeBakedModel(bakery, lens, clip ? originalModelClip : originalModel)); } - private static class CompositeBakedModel extends BakedModelWrapper { + private static class CompositeBakedModel extends DelegatedModel { private static final BlockModel MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, null, "field_177606_o"); private final List genQuads = new ArrayList<>(); diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index 288e12777..723d424e8 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -32,7 +32,7 @@ import javax.annotation.Nonnull; import java.util.List; import java.util.Random; -public class PlatformModel extends BakedModelWrapper { +public class PlatformModel extends DelegatedModel { public PlatformModel(IBakedModel original) { super(original); } diff --git a/src/main/java/vazkii/botania/common/block/BlockBifrost.java b/src/main/java/vazkii/botania/common/block/BlockBifrost.java index 58e7004bf..002e24fef 100644 --- a/src/main/java/vazkii/botania/common/block/BlockBifrost.java +++ b/src/main/java/vazkii/botania/common/block/BlockBifrost.java @@ -30,7 +30,7 @@ public class BlockBifrost extends BlockBifrostPerm implements ITileEntityProvide @Nonnull @Override - public ItemStack getPickBlock(@Nonnull BlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, PlayerEntity player) { + public ItemStack getItem(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state) { return new ItemStack(ModItems.rainbowRod); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 5c957e738..f1765170a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -41,7 +41,7 @@ public class BlockSolidVines extends VineBlock { @Nonnull @Override - public ItemStack getPickBlock(@Nonnull BlockState state, RayTraceResult target, @Nonnull IBlockReader world, @Nonnull BlockPos pos, PlayerEntity player) { + public ItemStack getItem(@Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull BlockState state) { return new ItemStack(Blocks.VINE); } } diff --git a/src/main/java/vazkii/botania/common/brew/ModPotions.java b/src/main/java/vazkii/botania/common/brew/ModPotions.java index 7cecad867..bbf0aa611 100644 --- a/src/main/java/vazkii/botania/common/brew/ModPotions.java +++ b/src/main/java/vazkii/botania/common/brew/ModPotions.java @@ -10,8 +10,8 @@ package vazkii.botania.common.brew; import net.minecraft.potion.Effect; import net.minecraftforge.event.RegistryEvent; - import net.minecraftforge.registries.IForgeRegistry; + import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.brew.potion.*; import vazkii.botania.common.lib.LibMisc; diff --git a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java index ec43939ef..643a3756d 100644 --- a/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java +++ b/src/main/java/vazkii/botania/common/impl/BotaniaAPIImpl.java @@ -220,7 +220,7 @@ public class BotaniaAPIImpl implements BotaniaAPI { public Map oreWeights = Collections.emptyMap(); public Map netherOreWeights = Collections.emptyMap(); - private Map, Function> paintableBlocks = new ConcurrentHashMap<>(); + private final Map, Function> paintableBlocks = new ConcurrentHashMap<>(); @Override public Map getOreWeights() {