diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index ed67f2183..a602d4e68 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -278,7 +278,7 @@ public final class ModelHandler { BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi")); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi")); - BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA)); // todo model + BotaniaAPIClient.registerSubtileModel(SubTileBergamute.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BERGAMUTE)); } private static void registerStandardBlocks() { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java index 222c8e799..c18dee15f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/BergamuteEventHandler.java @@ -12,6 +12,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.common.block.tile.mana.TilePool; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -21,7 +22,7 @@ import java.util.Random; @SideOnly(Side.CLIENT) public class BergamuteEventHandler { private static final Random RAND = new Random(); - private static final float MULTIPLIER = 0.1F; + private static final float MULTIPLIER = 0.15F; @SubscribeEvent(priority = EventPriority.LOWEST) public void onSoundEvent(PlaySoundEvent evt) { @@ -34,7 +35,7 @@ public class BergamuteEventHandler { evt.setResultSound(new WrappedSound(sound, MULTIPLIER)); if (RAND.nextBoolean()) { - Color color = new Color(berg.getColor()); + Color color = TilePool.PARTICLE_COLOR; BotaniaAPI.internalHandler.sparkleFX(berg.getWorld(), berg.getPos().getX() + 0.3 + Math.random() * 0.5, berg.getPos().getY() + 0.5 + Math.random() * 0.5, berg.getPos().getZ() + 0.3 + Math.random() * 0.5, color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random(), 5); } } @@ -62,36 +63,13 @@ public class BergamuteEventHandler { } @Nonnull @Override public ResourceLocation getSoundLocation() { return compose.getSoundLocation(); } - @Nullable @Override public SoundEventAccessor createAccessor(SoundHandler handler) { return compose.createAccessor(handler); } - @Nonnull @Override public Sound getSound() { - return compose.getSound(); - } - - @Nonnull - @Override - public SoundCategory getCategory() { - return compose.getCategory(); - } - - @Override - public boolean canRepeat() { - return compose.canRepeat(); - } - - @Override - public int getRepeatDelay() { - return compose.getRepeatDelay(); - } - - @Override - public float getPitch() { - return compose.getPitch(); - } - - @Override - public float getXPosF() { - return compose.getXPosF(); - } + @Nullable @Override public SoundEventAccessor createAccessor(@Nonnull SoundHandler handler) { return compose.createAccessor(handler); } + @Nonnull @Override public Sound getSound() { return compose.getSound(); } + @Nonnull @Override public SoundCategory getCategory() { return compose.getCategory(); } + @Override public boolean canRepeat() { return compose.canRepeat(); } + @Override public int getRepeatDelay() { return compose.getRepeatDelay(); } + @Override public float getPitch() { return compose.getPitch(); } + @Override public float getXPosF() { return compose.getXPosF(); } @Override public float getYPosF() { return compose.getYPosF(); } @Override public float getZPosF() { return compose.getZPosF(); } @Nonnull @Override public AttenuationType getAttenuationType() { return compose.getAttenuationType(); } diff --git a/src/main/resources/assets/botania/blockstates/bergamute.json b/src/main/resources/assets/botania/blockstates/bergamute.json new file mode 100644 index 000000000..52beeea8a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/bergamute.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:cross_tinted", + "textures": { + "cross": "botania:blocks/bergamute" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/bergamute" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/textures/blocks/bergamute.png b/src/main/resources/assets/botania/textures/blocks/bergamute.png new file mode 100644 index 000000000..04dae2733 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/bergamute.png differ