mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 03:15:07 +00:00
Fix lexicon and gun models, partially. lenses still look a bit weird
This commit is contained in:
1 parent
32b0f64127
commit
a0bd6ced48
4 files changed
+27
-17
No files matched your search
@@ -102,22 +102,21 @@ public class MiscellaneousIcons {
|
||||
IBakedModel original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon", "inventory"));
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon", "inventory"),
|
||||
new LexiconModel(original));
|
||||
/* todo 1.13 models referenced using overrides aren't put in the model registry?
|
||||
original = evt.getModelRegistry().get(new ModelResourceLocation("botania:lexicon_elven", "inventory"));
|
||||
evt.getModelRegistry().put(new ModelResourceLocation("botania:lexicon_elven", "inventory"),
|
||||
new LexiconModel(original));
|
||||
*/
|
||||
|
||||
// models referenced using json overrides aren't put in the model registry, so just go through all override models and wrap them there
|
||||
for (int i = 0; i < original.getOverrides().overrideBakedModels.size(); i++) {
|
||||
original.getOverrides().overrideBakedModels.set(i, new LexiconModel(original.getOverrides().overrideBakedModels.get(i)));
|
||||
}
|
||||
|
||||
// Mana Blaster
|
||||
ModelResourceLocation key = new ModelResourceLocation("botania:mana_gun", "inventory");
|
||||
IBakedModel originalModel = evt.getModelRegistry().get(key);
|
||||
evt.getModelRegistry().put(key, new GunModel(originalModel));
|
||||
|
||||
/* todo 1.13 models referenced using overrides aren't put in the model registry?
|
||||
key = new ModelResourceLocation("botania:mana_gun_clip", "inventory");
|
||||
originalModel = evt.getModelRegistry().get(key);
|
||||
evt.getModelRegistry().put(key, new GunModel(originalModel));
|
||||
*/
|
||||
// same as lexicon, reach into all json overrides and wrap them
|
||||
for (int i = 0; i < originalModel.getOverrides().overrideBakedModels.size(); i++) {
|
||||
originalModel.getOverrides().overrideBakedModels.set(i, new GunModel(originalModel.getOverrides().overrideBakedModels.get(i)));
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
|
||||
@@ -47,6 +47,12 @@ public class GunModel implements IBakedModel {
|
||||
@Nonnull
|
||||
@Override
|
||||
public IBakedModel getModelWithOverrides(IBakedModel model, ItemStack stack, @Nullable World worldIn, @Nullable EntityLivingBase entityIn) {
|
||||
// First, let json overrides on original model apply
|
||||
IBakedModel origOverride = originalModel.getOverrides().getModelWithOverrides(originalModel, stack, worldIn, entityIn);
|
||||
if (origOverride != null && origOverride != originalModel)
|
||||
return origOverride;
|
||||
|
||||
// Otherwise, look up our composite models
|
||||
ItemStack lens = ItemManaGun.getLens(stack);
|
||||
if(!lens.isEmpty()) {
|
||||
IBakedModel lensModel = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel(lens);
|
||||
@@ -121,23 +127,26 @@ public class GunModel implements IBakedModel {
|
||||
for(EnumFacing e : EnumFacing.values())
|
||||
faceQuads.put(e, new ArrayList<>());
|
||||
|
||||
Random rand = new Random(0);
|
||||
// Add lens quads, scaled and translated
|
||||
for(BakedQuad quad : lens.getQuads(null, null, new Random(0))) {
|
||||
for(BakedQuad quad : lens.getQuads(null, null, rand)) {
|
||||
genBuilder.add(transform(quad, transform));
|
||||
}
|
||||
|
||||
for(EnumFacing e : EnumFacing.values()) {
|
||||
faceQuads.get(e).addAll(lens.getQuads(null, e, new Random(0)).stream().map(input -> transform(input, transform)).collect(Collectors.toList()));
|
||||
rand.setSeed(0);
|
||||
faceQuads.get(e).addAll(lens.getQuads(null, e, rand).stream().map(input -> transform(input, transform)).collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
// Add gun quads
|
||||
genBuilder.addAll(gun.getQuads(null, null, new Random(0)));
|
||||
rand.setSeed(0);
|
||||
genBuilder.addAll(gun.getQuads(null, null, rand));
|
||||
for(EnumFacing e : EnumFacing.values()) {
|
||||
faceQuads.get(e).addAll(gun.getQuads(null, e, new Random(0)));
|
||||
rand.setSeed(0);
|
||||
faceQuads.get(e).addAll(gun.getQuads(null, e, rand));
|
||||
}
|
||||
|
||||
genQuads = genBuilder.build();
|
||||
|
||||
}
|
||||
|
||||
@Nonnull @Override public List<BakedQuad> getQuads(IBlockState state, EnumFacing face, @Nonnull Random rand) { return face == null ? genQuads : faceQuads.get(face); }
|
||||
|
||||
@@ -39,5 +39,5 @@ public class LexiconModel implements IBakedModel {
|
||||
@Override public boolean isBuiltInRenderer() { return false; }
|
||||
@Nonnull @Override public TextureAtlasSprite getParticleTexture() { return original.getParticleTexture(); }
|
||||
@SuppressWarnings("deprecation") @Nonnull @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
|
||||
@Nonnull @Override public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; }
|
||||
@Nonnull @Override public ItemOverrideList getOverrides() { return original.getOverrides(); }
|
||||
}
|
||||
Reference in new issue
Block a user