From 3eeaf3f9e37916281054d551d6cdc4108c2a11d9 Mon Sep 17 00:00:00 2001 From: Forstride Date: Sun, 7 Jan 2024 21:25:25 -0500 Subject: [PATCH] Added particles for the Thermoregulator --- .../d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 | 4 +- .../tags/blocks/passable_blocks.json | 3 +- .../api/particle/TANParticles.java | 10 +++ .../block/ThermoregulatorBlock.java | 14 ++-- .../client/handler/TooltipHandler.java | 2 - .../particle/ThermoregulatorParticle.java | 68 ++++++++++++++++++ .../java/toughasnails/core/ToughAsNails.java | 3 + .../java/toughasnails/init/ModClient.java | 10 +++ .../java/toughasnails/init/ModParticles.java | 7 +- .../toughasnails/particles/cooling.json | 8 --- .../toughasnails/particles/heating.json | 8 --- .../particles/thermoregulator_cool.json | 8 +++ .../particles/thermoregulator_neutral.json | 8 +++ .../particles/thermoregulator_warm.json | 8 +++ .../assets/toughasnails/particles/vapor.json | 8 --- .../textures/particle/cooling_0.png | Bin 119 -> 0 bytes .../textures/particle/cooling_1.png | Bin 119 -> 0 bytes .../textures/particle/cooling_2.png | Bin 119 -> 0 bytes .../textures/particle/cooling_3.png | Bin 119 -> 0 bytes .../textures/particle/heating_0.png | Bin 119 -> 0 bytes .../textures/particle/heating_1.png | Bin 119 -> 0 bytes .../textures/particle/heating_2.png | Bin 119 -> 0 bytes .../textures/particle/heating_3.png | Bin 119 -> 0 bytes .../particle/thermoregulator_cool_0.png | Bin 0 -> 174 bytes .../particle/thermoregulator_cool_1.png | Bin 0 -> 176 bytes .../particle/thermoregulator_cool_2.png | Bin 0 -> 153 bytes ...vapor_2.png => thermoregulator_cool_3.png} | Bin 136 -> 136 bytes .../particle/thermoregulator_neutral_0.png | Bin 0 -> 149 bytes .../particle/thermoregulator_neutral_1.png | Bin 0 -> 166 bytes .../particle/thermoregulator_neutral_2.png | Bin 0 -> 163 bytes ...or_3.png => thermoregulator_neutral_3.png} | Bin 126 -> 138 bytes .../particle/thermoregulator_warm_0.png | Bin 0 -> 174 bytes .../particle/thermoregulator_warm_1.png | Bin 0 -> 175 bytes .../particle/thermoregulator_warm_2.png | Bin 0 -> 152 bytes .../particle/thermoregulator_warm_3.png | Bin 0 -> 142 bytes .../textures/particle/vapor_0.png | Bin 165 -> 0 bytes .../textures/particle/vapor_1.png | Bin 162 -> 0 bytes .../main/resources/toughasnails.accesswidener | 1 + .../provider/TANBlockTagsProvider.java | 2 +- gradle.properties | 2 +- 40 files changed, 136 insertions(+), 38 deletions(-) create mode 100644 common/src/main/java/toughasnails/api/particle/TANParticles.java create mode 100644 common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java delete mode 100644 common/src/main/resources/assets/toughasnails/particles/cooling.json delete mode 100644 common/src/main/resources/assets/toughasnails/particles/heating.json create mode 100644 common/src/main/resources/assets/toughasnails/particles/thermoregulator_cool.json create mode 100644 common/src/main/resources/assets/toughasnails/particles/thermoregulator_neutral.json create mode 100644 common/src/main/resources/assets/toughasnails/particles/thermoregulator_warm.json delete mode 100644 common/src/main/resources/assets/toughasnails/particles/vapor.json delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/cooling_0.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/cooling_1.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/cooling_2.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/cooling_3.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/heating_0.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/heating_1.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/heating_2.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/heating_3.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_0.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_1.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_2.png rename common/src/main/resources/assets/toughasnails/textures/particle/{vapor_2.png => thermoregulator_cool_3.png} (52%) create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_neutral_0.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_neutral_1.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_neutral_2.png rename common/src/main/resources/assets/toughasnails/textures/particle/{vapor_3.png => thermoregulator_neutral_3.png} (52%) create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_0.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_1.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_2.png create mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_3.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/vapor_0.png delete mode 100644 common/src/main/resources/assets/toughasnails/textures/particle/vapor_1.png diff --git a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 index f935df15..9beaf8f9 100644 --- a/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 +++ b/common/src/generated/resources/.cache/d6a68f98580d9908a43dbfe9cc754bc0c1ac14b0 @@ -1,6 +1,6 @@ -// 1.20.4 2024-01-08T12:48:48.1761072 Tags for minecraft:block mod id toughasnails +// 1.20.4 2024-01-07T21:24:08.2345992 Tags for minecraft:block mod id toughasnails bffb0fdf09ac6cfbed64666a723e8a78cb784bbd data/minecraft/tags/blocks/mineable/axe.json 0342cd45a4d6f790afda91090de45871d9b0ef63 data/minecraft/tags/blocks/mineable/pickaxe.json eed9ca8217c04724f67008aba1a0a5edde5697c2 data/toughasnails/tags/blocks/cooling_blocks.json 658fab0118eb1ac9896e1b9ab89f2d5ed055a967 data/toughasnails/tags/blocks/heating_blocks.json -4e9fc3338709900bd37b9707629283ff25f3234a data/toughasnails/tags/blocks/passable_blocks.json +e31d0ccf1dd374df5d89a102ae1829d4411012f6 data/toughasnails/tags/blocks/passable_blocks.json diff --git a/common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json b/common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json index 556bab29..37493868 100644 --- a/common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json +++ b/common/src/generated/resources/data/toughasnails/tags/blocks/passable_blocks.json @@ -1,6 +1,7 @@ { "values": [ "#minecraft:doors", - "#minecraft:trapdoors" + "#minecraft:trapdoors", + "minecraft:scaffolding" ] } \ No newline at end of file diff --git a/common/src/main/java/toughasnails/api/particle/TANParticles.java b/common/src/main/java/toughasnails/api/particle/TANParticles.java new file mode 100644 index 00000000..ab0d08d8 --- /dev/null +++ b/common/src/main/java/toughasnails/api/particle/TANParticles.java @@ -0,0 +1,10 @@ +package toughasnails.api.particle; + +import net.minecraft.core.particles.SimpleParticleType; + +public class TANParticles +{ + public static SimpleParticleType THERMOREGULATOR_COOL; + public static SimpleParticleType THERMOREGULATOR_WARM; + public static SimpleParticleType THERMOREGULATOR_NEUTRAL; +} diff --git a/common/src/main/java/toughasnails/block/ThermoregulatorBlock.java b/common/src/main/java/toughasnails/block/ThermoregulatorBlock.java index 6a794b24..a353b2e8 100644 --- a/common/src/main/java/toughasnails/block/ThermoregulatorBlock.java +++ b/common/src/main/java/toughasnails/block/ThermoregulatorBlock.java @@ -7,7 +7,7 @@ import com.mojang.serialization.MapCodec; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.core.particles.ParticleOptions; import net.minecraft.util.RandomSource; import net.minecraft.world.Containers; import net.minecraft.world.InteractionHand; @@ -25,6 +25,7 @@ import net.minecraft.world.level.block.state.properties.DirectionProperty; import net.minecraft.world.phys.BlockHitResult; import toughasnails.api.blockentity.TANBlockEntityTypes; +import toughasnails.api.particle.TANParticles; import toughasnails.block.entity.ThermoregulatorBlockEntity; import javax.annotation.Nullable; @@ -120,7 +121,7 @@ public void onRemove(BlockState state, Level level, BlockPos pos, BlockState new super.onRemove(state, level, pos, newState, $$4); } - /*@Override + @Override public void animateTick(BlockState p_221253_, Level p_221254_, BlockPos p_221255_, RandomSource p_221256_) { boolean cooling = p_221253_.getValue(COOLING); @@ -142,10 +143,11 @@ public void animateTick(BlockState p_221253_, Level p_221254_, BlockPos p_221255 double xmove = direction$axis == Direction.Axis.X ? (double)direction.getStepX() * 0.15D : ymove; double zmove = direction$axis == Direction.Axis.Z ? (double)direction.getStepZ() * 0.15D : ymove; - p_221254_.addParticle(ParticleTypes.CAMPFIRE_COSY_SMOKE, d0 + d5, d1 + d4, d2 + d6, xmove, ymove, zmove); + ParticleOptions particle = TANParticles.THERMOREGULATOR_NEUTRAL; + if (cooling && !heating) { particle = TANParticles.THERMOREGULATOR_COOL; } + if (!cooling && heating) { particle = TANParticles.THERMOREGULATOR_WARM; } - if (cooling && p_221256_.nextInt(6) == 0) { p_221254_.addParticle(ParticleTypes.SNOWFLAKE, d0 + d5, d1 + d6, d2 + d6, xmove, ymove, zmove); } - if (heating && p_221256_.nextInt(6) == 0) { p_221254_.addParticle(ParticleTypes.SMALL_FLAME, d0 + d5, d1 + d6, d2 + d6, xmove, ymove, zmove); } + p_221254_.addParticle(particle, d0 + d5, d1 + d4, d2 + d6, xmove, ymove, zmove); } - }*/ + } } diff --git a/common/src/main/java/toughasnails/client/handler/TooltipHandler.java b/common/src/main/java/toughasnails/client/handler/TooltipHandler.java index d8cf2aaf..eca3b00f 100644 --- a/common/src/main/java/toughasnails/client/handler/TooltipHandler.java +++ b/common/src/main/java/toughasnails/client/handler/TooltipHandler.java @@ -14,7 +14,6 @@ import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.core.Holder; import net.minecraft.core.RegistryAccess; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.network.chat.Component; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; @@ -23,7 +22,6 @@ import net.minecraft.world.item.armortrim.TrimMaterials; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; -import toughasnails.core.ToughAsNails; import toughasnails.init.ModConfig; import toughasnails.init.ModTags; import toughasnails.thirst.ThirstOverlayRenderer; diff --git a/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java b/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java new file mode 100644 index 00000000..71809cdc --- /dev/null +++ b/common/src/main/java/toughasnails/client/particle/ThermoregulatorParticle.java @@ -0,0 +1,68 @@ +package toughasnails.client.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.*; +import net.minecraft.core.particles.SimpleParticleType; + +public class ThermoregulatorParticle extends TextureSheetParticle +{ + ThermoregulatorParticle(ClientLevel p_105856_, double p_105857_, double p_105858_, double p_105859_, double p_105860_, double p_105861_, double p_105862_) + { + super(p_105856_, p_105857_, p_105858_, p_105859_); + this.lifetime = this.random.nextInt(8) + 8; + this.gravity = 3.0E-6F; + this.xd = p_105860_; + this.yd = p_105861_; + this.zd = p_105862_; + } + + @Override + public void tick() + { + this.xo = this.x; + this.yo = this.y; + this.zo = this.z; + if (this.age++ < this.lifetime && !(this.alpha <= 0.0F)) + { + this.move(this.xd, this.yd, this.zd); + if (this.age >= this.lifetime - 60 && this.alpha > 0.01F) + { + this.alpha -= 0.01F; + } + + } + else + { + this.remove(); + } + } + + @Override + public float getQuadSize(float p_107089_) + { + float f = ((float)this.age + p_107089_) / (float)this.lifetime; + return this.quadSize * (1.0F - f * f); + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_TRANSLUCENT; + } + + public static class Provider implements ParticleProvider + { + private final SpriteSet sprites; + + public Provider(SpriteSet p_105899_) { + this.sprites = p_105899_; + } + + public Particle createParticle(SimpleParticleType p_105910_, ClientLevel p_105911_, double p_105912_, double p_105913_, double p_105914_, double p_105915_, double p_105916_, double p_105917_) + { + ThermoregulatorParticle particle = new ThermoregulatorParticle(p_105911_, p_105912_, p_105913_, p_105914_, p_105915_, p_105916_, p_105917_); + particle.setAlpha(0.5F); + particle.pickSprite(this.sprites); + return particle; + } + } +} \ No newline at end of file diff --git a/common/src/main/java/toughasnails/core/ToughAsNails.java b/common/src/main/java/toughasnails/core/ToughAsNails.java index 12064f39..a1714210 100644 --- a/common/src/main/java/toughasnails/core/ToughAsNails.java +++ b/common/src/main/java/toughasnails/core/ToughAsNails.java @@ -95,6 +95,9 @@ private static void addClientHandlers() EventManager.addListener(ModClient::registerBlockColors); EventManager.addListener(ModClient::registerItemColors); + // Particles + EventManager.addListener(ModClient::registerParticleSprites); + // Tooltips EventManager.addListener(TooltipHandler::onTooltip); EventManager.addListener(TooltipHandler::onRenderTooltip); diff --git a/common/src/main/java/toughasnails/init/ModClient.java b/common/src/main/java/toughasnails/init/ModClient.java index 90f5b1be..92779024 100644 --- a/common/src/main/java/toughasnails/init/ModClient.java +++ b/common/src/main/java/toughasnails/init/ModClient.java @@ -5,6 +5,7 @@ package toughasnails.init; import glitchcore.event.client.RegisterColorsEvent; +import glitchcore.event.client.RegisterParticleSpritesEvent; import glitchcore.util.RenderTypeHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -21,8 +22,10 @@ import net.minecraft.world.level.Level; import org.jetbrains.annotations.Nullable; import toughasnails.api.item.TANItems; +import toughasnails.api.particle.TANParticles; import toughasnails.api.temperature.TemperatureHelper; import toughasnails.api.temperature.TemperatureLevel; +import toughasnails.client.particle.ThermoregulatorParticle; import toughasnails.core.ToughAsNails; import toughasnails.item.DyeableWoolItem; import toughasnails.item.LeafArmorItem; @@ -120,6 +123,13 @@ public static void registerBlockColors(RegisterColorsEvent.Block event) event.register((state, world, pos, tintIndex) -> 0x3F76E4, WATER_PURIFIER); } + public static void registerParticleSprites(RegisterParticleSpritesEvent event) + { + event.registerSpriteSet(TANParticles.THERMOREGULATOR_COOL, ThermoregulatorParticle.Provider::new); + event.registerSpriteSet(TANParticles.THERMOREGULATOR_WARM, ThermoregulatorParticle.Provider::new); + event.registerSpriteSet(TANParticles.THERMOREGULATOR_NEUTRAL, ThermoregulatorParticle.Provider::new); + } + public static void setupRenderTypes() { RenderType transparentRenderType = RenderType.cutoutMipped(); diff --git a/common/src/main/java/toughasnails/init/ModParticles.java b/common/src/main/java/toughasnails/init/ModParticles.java index 0b77b5e4..a70a1446 100644 --- a/common/src/main/java/toughasnails/init/ModParticles.java +++ b/common/src/main/java/toughasnails/init/ModParticles.java @@ -4,10 +4,12 @@ ******************************************************************************/ package toughasnails.init; +import net.minecraft.core.particles.ParticleOptions; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraft.resources.ResourceLocation; import toughasnails.api.TANAPI; +import toughasnails.api.particle.TANParticles; import java.util.function.BiConsumer; @@ -15,9 +17,12 @@ public class ModParticles { public static void registerParticles(BiConsumer> func) { + TANParticles.THERMOREGULATOR_COOL = register(func, "thermoregulator_cool", new SimpleParticleType(false)); + TANParticles.THERMOREGULATOR_WARM = register(func, "thermoregulator_warm", new SimpleParticleType(false)); + TANParticles.THERMOREGULATOR_NEUTRAL = register(func, "thermoregulator_neutral", new SimpleParticleType(false)); } - private static ParticleType register(BiConsumer> func, String name, ParticleType particle) + private static > T register(BiConsumer> func, String name, T particle) { func.accept(new ResourceLocation(TANAPI.MOD_ID, name), particle); return particle; diff --git a/common/src/main/resources/assets/toughasnails/particles/cooling.json b/common/src/main/resources/assets/toughasnails/particles/cooling.json deleted file mode 100644 index b657390b..00000000 --- a/common/src/main/resources/assets/toughasnails/particles/cooling.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "toughasnails:cooling_0", - "toughasnails:cooling_1", - "toughasnails:cooling_2", - "toughasnails:cooling_3" - ] -} diff --git a/common/src/main/resources/assets/toughasnails/particles/heating.json b/common/src/main/resources/assets/toughasnails/particles/heating.json deleted file mode 100644 index 1ec881c0..00000000 --- a/common/src/main/resources/assets/toughasnails/particles/heating.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "toughasnails:heating_0", - "toughasnails:heating_1", - "toughasnails:heating_2", - "toughasnails:heating_3" - ] -} diff --git a/common/src/main/resources/assets/toughasnails/particles/thermoregulator_cool.json b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_cool.json new file mode 100644 index 00000000..5662e0a0 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_cool.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "toughasnails:thermoregulator_cool_0", + "toughasnails:thermoregulator_cool_1", + "toughasnails:thermoregulator_cool_2", + "toughasnails:thermoregulator_cool_3" + ] +} diff --git a/common/src/main/resources/assets/toughasnails/particles/thermoregulator_neutral.json b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_neutral.json new file mode 100644 index 00000000..2cb5514d --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_neutral.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "toughasnails:thermoregulator_neutral_0", + "toughasnails:thermoregulator_neutral_1", + "toughasnails:thermoregulator_neutral_2", + "toughasnails:thermoregulator_neutral_3" + ] +} diff --git a/common/src/main/resources/assets/toughasnails/particles/thermoregulator_warm.json b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_warm.json new file mode 100644 index 00000000..22383f52 --- /dev/null +++ b/common/src/main/resources/assets/toughasnails/particles/thermoregulator_warm.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "toughasnails:thermoregulator_warm_0", + "toughasnails:thermoregulator_warm_1", + "toughasnails:thermoregulator_warm_2", + "toughasnails:thermoregulator_warm_3" + ] +} diff --git a/common/src/main/resources/assets/toughasnails/particles/vapor.json b/common/src/main/resources/assets/toughasnails/particles/vapor.json deleted file mode 100644 index 079b20f7..00000000 --- a/common/src/main/resources/assets/toughasnails/particles/vapor.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "textures": [ - "toughasnails:vapor_0", - "toughasnails:vapor_1", - "toughasnails:vapor_2", - "toughasnails:vapor_3" - ] -} diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/cooling_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/cooling_0.png deleted file mode 100644 index 999fab9863eeb0497b135f863a6bb3ab948d2e9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vhuhnuC$49q5s_ZQikegKLyc)I$z JtaD0e0sxYw8(aVY diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/cooling_1.png b/common/src/main/resources/assets/toughasnails/textures/particle/cooling_1.png deleted file mode 100644 index fca0eb64e26c6569445449104dc5cf3b549a3a78..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vgDM#V2V1{PbU&;!St1A*cUp00i_ I>zopr0Ek!`>i_@% diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/cooling_2.png b/common/src/main/resources/assets/toughasnails/textures/particle/cooling_2.png deleted file mode 100644 index e7c1dfb5aad0b396f0c6a9243860ba93ee124831..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7&Va6R3v)=**c|2VlLnOkJBR>AMXJC2BG(YM|vo27a!PC{x JWt~$(69C>W9hm?C diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/cooling_3.png b/common/src/main/resources/assets/toughasnails/textures/particle/cooling_3.png deleted file mode 100644 index 7cdeb876410f6d8d472286a16a9ddff205745c7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vgD#gFIq46O5*?v|=N&;*Jzc)I$z JtaD0e0sx#T8@d1h diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/heating_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/heating_0.png deleted file mode 100644 index 10506a186dcfcf6beddd940a43bbb2bc26b9f423..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vg@g{%e(1G6Nfe(yskUZ6OGr>mdK II;Vst09XPTiU0rr diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/heating_1.png b/common/src/main/resources/assets/toughasnails/textures/particle/heating_1.png deleted file mode 100644 index 6abb57f311227d1056a7c8b9fea849eabecde798..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vgD#Z_f42IlvSJvOVa8Ue)_JYD@< J);T3K0RV?n8s`82 diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/heating_2.png b/common/src/main/resources/assets/toughasnails/textures/particle/heating_2.png deleted file mode 100644 index a8af778463be9f60bedde2b56f09984a739070df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7&Va6R3v)=**c|2VlLnOkJf9yXc$G|d$@#R~_2Qz@;44$rj JF6*2UngHgc9v=Vz diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/heating_3.png b/common/src/main/resources/assets/toughasnails/textures/particle/heating_3.png deleted file mode 100644 index fe11b6265ba0ed0d9c2338610d54c2541a2ac95d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2s6ii6yp7}lMWc?smOq&xaLGB9lH z=l+w(3gmMZctjR6Fz_7$VMb96uLhtXkEe@ch(vhukD_292A0)~&rj|@=KvIE@O1Ta JS?83{1OS@u8~gwO diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_0.png new file mode 100644 index 0000000000000000000000000000000000000000..00c78e3eca8943fffbdfe547a9219770662253e6 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+3?x7IEPn{37>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yUjF@m|EKRjUJQHGWFW;{666>B|3Aa^Q@lX644efXk;M!Qd>$j+1|*LJg=>VG1LG6 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_2.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_cool_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b9a5e61f2b650e4ce0fdae871446d7652740b3d5 GIT binary patch literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg|mVWX}_O=fp0&f1#7Sh0|SGsr;B5VM0oN7nKeKD{kJ#jWt97OP|-0!owK2l Zk-^bUDBz&Otr delta 70 zcmeBR>|mVWX@8i3f$uQm@%$Aj3=9mio-U3d65+`UWd5)-rARS9m{RfUi)I9qTQHM^ Z1jDXV!htF}G7dn644$rjF6*2UngIXF6$1bO diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_neutral_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_neutral_0.png new file mode 100644 index 0000000000000000000000000000000000000000..e00fd24ccfd407bcaf497147410f671d33e287c0 GIT binary patch literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg*~f?A#~jv*4^$qQuuv@>al^UPRa!hHCBbi%9u q>t`3R7I?aumAcJf@?vCWW_b0Te>wM)dAEVO7(8A5T-G@yGywocKq>$j+1|*LJg>$j+1|*LJgHVw~XVcz}U{?*L=gwN6e31_pUg7sn8Z@Z<%2KmNadR<9u}`iGqbP0l+XkKVZInB delta 59 zcmeBTtefCzdYFNM?=a)>{1qt-3=G1aE{-7*;mHe_fAF&esJ&%iW@eb`!u)qrviu^T OG=rzBpUXO@geCwN!4a+i diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_0.png new file mode 100644 index 0000000000000000000000000000000000000000..52fd5b3408d86b59436385375f783b68282085c0 GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+3?x7IEPn{37>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=y{=YK+%h4_%ujb`PXCTE~666>B|3Aa^Q@lX644efXk;M!Qd>$j+1|*LJgS}lwJuvYxkC=3PSC62|!L#~Y;SEdzopr0Iq>CtpET3 literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_2.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_2.png new file mode 100644 index 0000000000000000000000000000000000000000..9a8df76767fd900ff566ecb9c310c60ec31a8c1f GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgFVdQ&MBb@09oEA=l}o! literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_3.png b/common/src/main/resources/assets/toughasnails/textures/particle/thermoregulator_warm_3.png new file mode 100644 index 0000000000000000000000000000000000000000..9d3c98bdb5ff0734824feeea8d979962ac60f22d GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg>@dAeR6D literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/toughasnails/textures/particle/vapor_0.png b/common/src/main/resources/assets/toughasnails/textures/particle/vapor_0.png deleted file mode 100644 index e95370a84434366cc44e76be17076561989721f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg?p>$j+1|*LJg`W (Z)V # Thirst diff --git a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java b/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java index fa117c10..1e5b21d9 100644 --- a/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java +++ b/forge/src/main/java/toughasnails/forge/datagen/provider/TANBlockTagsProvider.java @@ -34,6 +34,6 @@ protected void addTags(HolderLookup.Provider provider) // TAN tags this.tag(ModTags.Blocks.COOLING_BLOCKS).add(Blocks.SOUL_FIRE, Blocks.SOUL_CAMPFIRE, Blocks.SOUL_LANTERN, Blocks.PACKED_ICE, Blocks.BLUE_ICE, Blocks.POWDER_SNOW_CAULDRON); this.tag(ModTags.Blocks.HEATING_BLOCKS).add(Blocks.FIRE, Blocks.CAMPFIRE, Blocks.LANTERN, Blocks.LAVA, Blocks.MAGMA_BLOCK, Blocks.LAVA_CAULDRON); - this.tag(ModTags.Blocks.PASSABLE_BLOCKS).addTags(BlockTags.DOORS, BlockTags.TRAPDOORS); + this.tag(ModTags.Blocks.PASSABLE_BLOCKS).addTags(BlockTags.DOORS, BlockTags.TRAPDOORS).add(Blocks.SCAFFOLDING); } } diff --git a/gradle.properties b/gradle.properties index 89927a9d..f02cdd18 100644 --- a/gradle.properties +++ b/gradle.properties @@ -40,5 +40,5 @@ org.gradle.daemon=false # Dependencies nightconfig_version=3.6.7 -glitchcore_version=1.0.0.40 +glitchcore_version=1.0.0.41 serene_seasons_version=9.3.0.0