Datagenerate incense plate, pump, fel pumpkin, tiny potato

This commit is contained in:
Vincent Lee committed 2020-01-17 21:24:00 -06:00
1 parent f58a48c254
commit d75df9fa6a
15 files changed
+88 -41

No files matched your search

@@ -146,7 +146,7 @@ public class MiscellaneousIcons {
evt.getModelRegistry().put(key, new GunModel(evt.getModelLoader(), originalModel, originalModelClip));
RenderTileCorporeaCrystalCube.cubeModel = evt.getModelRegistry().get(prefix("block/corporea_crystal_cube_glass"));
RenderTilePump.headModel = evt.getModelRegistry().get(prefix("block/mana_pump_head"));
RenderTilePump.headModel = evt.getModelRegistry().get(prefix("block/pump_head"));
// Icons
goldfishModel = evt.getModelRegistry().get(prefix("icon/goldfish"));
@@ -103,7 +103,7 @@ public final class ModelHandler {
ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun", "inventory"));
ModelLoader.addSpecialModel(new ModelResourceLocation(LibMisc.MOD_ID + ":desu_gun_clip", "inventory"));
ModelLoader.addSpecialModel(prefix("block/corporea_crystal_cube_glass"));
ModelLoader.addSpecialModel(prefix("block/mana_pump_head"));
ModelLoader.addSpecialModel(prefix("block/pump_head"));
registerSubtiles();
ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderTileAltar::new);
@@ -1,6 +1,5 @@
package vazkii.botania.client.model;
import com.google.common.collect.ImmutableMap;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.blaze3d.matrix.MatrixStack;
@@ -25,7 +24,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.BakedModelWrapper;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.IModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.ModelTransformComposition;
import net.minecraftforge.client.model.SimpleModelTransform;
import net.minecraftforge.client.model.data.EmptyModelData;
@@ -52,7 +50,7 @@ public class FloatingFlowerModel implements IModelGeometry<FloatingFlowerModel>
private IUnbakedModel unbakedFlower;
private final Map<IFloatingFlower.IslandType, IUnbakedModel> unbakedIslands = new HashMap<>();
private FloatingFlowerModel(@Nullable IUnbakedModel flower) {
private FloatingFlowerModel(IUnbakedModel flower) {
this.unbakedFlower = flower;
}
@@ -53,10 +53,9 @@ public class BlockstateProvider extends BlockStateProvider {
protected void registerStatesAndModels() {
Registry.BLOCK.stream().filter(b -> LibMisc.MOD_ID.equals(b.getRegistryName().getNamespace()))
.forEach(b -> {
if (b == ModBlocks.tinyPotato
|| b instanceof BlockRedString || b instanceof BlockFloatingFlower
if (b instanceof BlockRedString || b instanceof BlockFloatingFlower
|| b == ModBlocks.craftCrate || b == ModBlocks.ghostRail
|| b == ModBlocks.pump || b == ModBlocks.incensePlate || b == ModBlocks.felPumpkin || b == ModBlocks.solidVines)
|| b == ModBlocks.solidVines)
return;
String name = b.getRegistryName().getPath();
@@ -127,6 +126,12 @@ public class BlockstateProvider extends BlockStateProvider {
ModelFile onFile = models().getExistingFile(prefix("block/" + name + "_powered"));
getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, false).setModels(new ConfiguredModel(offFile));
getVariantBuilder(b).partialState().with(BotaniaStateProps.POWERED, true).setModels(new ConfiguredModel(onFile));
} else if (b == ModBlocks.tinyPotato || b == ModBlocks.felPumpkin || b == ModBlocks.pump) {
ModelFile file = models().getExistingFile(prefix("block/" + name));
horizontalBlock(b, file);
} else if (b == ModBlocks.incensePlate) {
ModelFile file = models().getExistingFile(prefix("block/" + name));
horizontalBlock(b, file, 0);
} else {
simpleBlock(b, models().getExistingFile(prefix("block/" + name)));
}