Fix mana blaster lens render

This commit is contained in:
Vincent Lee committed 2020-01-18 16:09:19 -06:00
1 parent 8e9f5a1473
commit 4691f7d4a1
2 files changed
+35 -36

No files matched your search

@@ -9,22 +9,27 @@ import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.BlockModel;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemModelGenerator;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.resources.IResource;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.model.BakedModelWrapper;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.SimpleModelTransform;
import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
import org.apache.commons.lang3.tuple.Pair;
import vazkii.botania.common.Botania;
import vazkii.botania.common.item.ItemManaGun;
@@ -69,19 +74,8 @@ public class GunModel implements IBakedModel {
ItemStack lens = ItemManaGun.getLens(stack);
if(!lens.isEmpty()) {
// TODO 1.14 : currently broken because it goes through the vanilla codepath which doesn't handle builtin/generated models
// todo 1.15 : check above statement lol
ResourceLocation loc = new ResourceLocation(lens.getItem().getRegistryName().getNamespace(), "models/item/" + lens.getItem().getRegistryName().getPath() + ".json");
IUnbakedModel unbaked;
try (IResource json = Minecraft.getInstance().getResourceManager().getResource(loc)) {
unbaked = BlockModel.deserialize(new InputStreamReader(json.getInputStream()));
} catch (IOException e) {
Botania.LOGGER.error("Missing flower model {}", loc);
unbaked = BlockModel.deserialize(ModelBakery.MISSING_MODEL_MESH);
}
return GunModel.this.getModel(unbaked, clip);
}
else return clip ? originalModelClip : originalModel;
return GunModel.this.getModel(lens, clip);
} else return clip ? originalModelClip : originalModel;
}
};
@@ -98,33 +92,44 @@ public class GunModel implements IBakedModel {
@Nonnull @Override public TextureAtlasSprite getParticleTexture() { return originalModel.getParticleTexture(); }
@Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return originalModel.getItemCameraTransforms(); }
private final HashMap<Pair<IUnbakedModel, Boolean>, CompositeBakedModel> cache = new HashMap<>();
private final HashMap<Pair<Item, Boolean>, CompositeBakedModel> cache = new HashMap<>();
private CompositeBakedModel getModel(IUnbakedModel lens, boolean clip) {
return cache.computeIfAbsent(Pair.of(lens, clip), p -> new CompositeBakedModel(bakery, p.getLeft(), p.getRight() ? originalModelClip : originalModel));
private CompositeBakedModel getModel(ItemStack lens, boolean clip) {
return cache.computeIfAbsent(Pair.of(lens.getItem(), clip), p -> new CompositeBakedModel(bakery, lens, clip ? originalModelClip : originalModel));
}
private static class CompositeBakedModel implements IBakedModel {
private static class CompositeBakedModel extends BakedModelWrapper<IBakedModel> {
private static final BlockModel MODEL_GENERATED = ObfuscationReflectionHelper.getPrivateValue(ModelBakery.class, null, "field_177606_o");
private final IBakedModel gun;
private final List<BakedQuad> genQuads = new ArrayList<>();
private final Map<Direction, List<BakedQuad>> faceQuads = new EnumMap<>(Direction.class);
CompositeBakedModel(ModelBakery bakery, IUnbakedModel lensUnbaked, IBakedModel gun) {
this.gun = gun;
CompositeBakedModel(ModelBakery bakery, ItemStack lens, IBakedModel gun) {
super(gun);
final TransformationMatrix transform = new TransformationMatrix(new Vector3f(-0.2F, 0.4F, 0.8F), Vector3f.POSITIVE_Y.getDegreesQuaternion((float) Math.PI / 2), new Vector3f(0.625F, 0.625F, 0.625F), null);
IBakedModel lens = lensUnbaked.bake(bakery, ModelLoader.defaultTextureGetter(), new SimpleModelTransform(transform), prefix("gun_lens_" + lensUnbaked.toString()));
IUnbakedModel lensUnbaked = bakery.getUnbakedModel(new ModelResourceLocation(lens.getItem().getRegistryName(), "inventory"));
IModelTransform transform = new SimpleModelTransform(new TransformationMatrix(new Vector3f(-0.4F, 0.2F, 0.0F), Vector3f.POSITIVE_Y.getRadialQuaternion((float) Math.PI / 2), new Vector3f(0.625F, 0.625F, 0.625F), null));
ResourceLocation name = prefix("gun_with_" + lens.getItem().getRegistryName().toString().replace(':', '_'));
IBakedModel lensBaked;
if (lensUnbaked instanceof BlockModel && ((BlockModel) lensUnbaked).getRootModel() == MODEL_GENERATED) {
BlockModel bm = (BlockModel) lensUnbaked;
lensBaked = new ItemModelGenerator()
.makeItemModel(ModelLoader.defaultTextureGetter(), bm)
.bake(bakery, bm, ModelLoader.defaultTextureGetter(), transform, name);
} else {
lensBaked = lensUnbaked.bake(bakery, ModelLoader.defaultTextureGetter(), transform, name);
}
for(Direction e : Direction.values())
faceQuads.put(e, new ArrayList<>());
Random rand = new Random(0);
genQuads.addAll(lens.getQuads(null, null, rand));
genQuads.addAll(lensBaked.getQuads(null, null, rand));
for(Direction e : Direction.values()) {
rand.setSeed(0);
faceQuads.get(e).addAll(lens.getQuads(null, e, rand));
faceQuads.get(e).addAll(lensBaked.getQuads(null, e, rand));
}
// Add gun quads
@@ -136,20 +141,15 @@ public class GunModel implements IBakedModel {
}
}
@Nonnull @Override public List<BakedQuad> getQuads(BlockState state, Direction face, @Nonnull Random rand) { return face == null ? genQuads : faceQuads.get(face); }
// Forward all to gun model
@Override public boolean isAmbientOcclusion() { return gun.isAmbientOcclusion(); }
@Override public boolean isGui3d() { return gun.isGui3d(); }
@Override public boolean isBuiltInRenderer() { return gun.isBuiltInRenderer(); }
@Nonnull @Override public TextureAtlasSprite getParticleTexture() { return gun.getParticleTexture();}
@Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return gun.getItemCameraTransforms(); }
@Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; }
@Nonnull
@Override
public List<BakedQuad> getQuads(BlockState state, Direction face, @Nonnull Random rand) {
return face == null ? genQuads : faceQuads.get(face);
}
@Override
public IBakedModel handlePerspective(@Nonnull ItemCameraTransforms.TransformType cameraTransformType, MatrixStack stack) {
// apply gun transforms to stack but use self model still
gun.handlePerspective(cameraTransformType, stack);
super.handlePerspective(cameraTransformType, stack);
return this;
}
}
@@ -119,7 +119,6 @@ public class RenderTileTinyPotato extends TileEntityRenderer<TileTinyPotato> {
ms.push();
Minecraft mc = Minecraft.getInstance();
String name = potato.name.getString().toLowerCase().trim();
Pair<ShaderHelper.BotaniaShader, String> shaderStrippedName = stripShaderName(name);
ShaderHelper.BotaniaShader shader = shaderStrippedName.getFirst();