Skip to content

Commit 7987ab5

Browse files
committed
* Fixed Impeti not spraying particles or making noise when activated (Not when erroring)
* Adjusted Fabric creative mode tab entries (untested) * Fixed scrolls being unreadable * Fixed rendering artifacts when both toasts and casting stack are present on screen
1 parent 96e569e commit 7987ab5

File tree

4 files changed

+27
-8
lines changed

4 files changed

+27
-8
lines changed

Common/src/main/java/at/petrak/hexcasting/api/casting/circles/BlockEntityAbstractImpetus.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ public void startExecution(@Nullable ServerPlayer player) {
190190
this.executionState.getTickSpeed());
191191
serverLevel.setBlockAndUpdate(this.getBlockPos(),
192192
this.getBlockState().setValue(BlockCircleComponent.ENERGIZED, true));
193+
ICircleComponent.sfx(this.getBlockPos(), this.getBlockState(), this.level, this, true);
193194
}
194195

195196
@Contract(pure = true)

Common/src/main/java/at/petrak/hexcasting/client/render/RenderLib.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import at.petrak.hexcasting.api.mod.HexConfig
77
import at.petrak.hexcasting.api.utils.TAU
88
import at.petrak.hexcasting.client.ClientTickCounter
99
import at.petrak.hexcasting.client.gui.GuiSpellcasting
10+
import com.mojang.blaze3d.vertex.BufferUploader
1011
import com.mojang.blaze3d.vertex.DefaultVertexFormat
1112
import com.mojang.blaze3d.vertex.PoseStack
1213
import com.mojang.blaze3d.vertex.Tesselator
@@ -456,4 +457,5 @@ fun renderQuad(
456457
.setColor(color)
457458
buf.addVertex(mat, x + w, y, 0f)
458459
.setColor(color)
460+
BufferUploader.drawWithShader(buf.buildOrThrow())
459461
}

Common/src/main/java/at/petrak/hexcasting/common/items/storage/ItemScroll.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import at.petrak.hexcasting.api.casting.ActionRegistryEntry;
44
import at.petrak.hexcasting.api.casting.iota.Iota;
5+
import at.petrak.hexcasting.api.casting.iota.NullIota;
56
import at.petrak.hexcasting.api.casting.iota.PatternIota;
67
import at.petrak.hexcasting.api.casting.math.HexPattern;
78
import at.petrak.hexcasting.api.item.IotaHolderItem;
@@ -188,4 +189,10 @@ public Optional<TooltipComponent> getTooltipImage(ItemStack stack) {
188189

189190
return Optional.empty();
190191
}
192+
193+
@Override
194+
public @Nullable Iota readIota(ItemStack stack) {
195+
var pattern = stack.get(HexDataComponents.PATTERN);
196+
return pattern != null ? new PatternIota(pattern) : null;
197+
}
191198
}

Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import at.petrak.hexcasting.common.casting.actions.spells.great.OpAltiora
2222
import at.petrak.hexcasting.common.command.PatternResKeyArgument
2323
import at.petrak.hexcasting.common.entities.HexEntities
2424
import at.petrak.hexcasting.common.items.ItemJewelerHammer
25+
import at.petrak.hexcasting.common.items.magic.ItemMediaBattery
2526
import at.petrak.hexcasting.common.items.storage.ItemScroll
2627
import at.petrak.hexcasting.common.lib.*
2728
import at.petrak.hexcasting.common.lib.hex.*
@@ -172,7 +173,15 @@ object FabricHexInitializer : ModInitializer {
172173
}
173174
ItemGroupEvents.modifyEntriesEvent(HexCreativeTabs.HEX_KEY).register { r ->
174175
for (item in this.itemsToAddToCreativeTab) {
175-
r.accept(item)
176+
if (item is ItemMediaBattery) {
177+
r.accept(HexItems.BATTERY_DUST_STACK.get())
178+
r.accept(HexItems.BATTERY_SHARD_STACK.get())
179+
r.accept(HexItems.BATTERY_CRYSTAL_STACK.get())
180+
r.accept(HexItems.BATTERY_QUENCHED_SHARD_STACK.get())
181+
r.accept(HexItems.BATTERY_QUENCHED_BLOCK_STACK.get())
182+
} else {
183+
r.accept(item)
184+
}
176185
}
177186
}
178187
}
@@ -201,7 +210,7 @@ object FabricHexInitializer : ModInitializer {
201210
.add(HexAttributes.AMBIT_RADIUS)
202211
.add(HexAttributes.MEDIA_CONSUMPTION_MODIFIER)
203212
.add(HexAttributes.SENTINEL_RADIUS))
204-
HexMobEffects.register(bind(BuiltInRegistries.MOB_EFFECT))
213+
HexMobEffects.register()
205214
HexPotions.registerPotions(bind(BuiltInRegistries.POTION))
206215
HexDataComponents.registerDataComponents(bind(BuiltInRegistries.DATA_COMPONENT_TYPE))
207216

@@ -237,12 +246,6 @@ object FabricHexInitializer : ModInitializer {
237246

238247
// sorry lex (not sorry)
239248
private fun fabricOnlyRegistration() {
240-
DefaultItemComponentEvents.MODIFY.register {
241-
it.modify(Items.PUMPKIN_PIE, {
242-
it.set(HexDataComponents.IOTA, DoubleIota(Math.PI))
243-
})
244-
}
245-
246249
for (item in BuiltInRegistries.ITEM) {
247250
if (item is PigmentItem) {
248251
HexCardinalComponents.PIGMENT_ITEM_LOOKUP.registerForItems({
@@ -285,6 +288,12 @@ object FabricHexInitializer : ModInitializer {
285288
HexCardinalComponents.MEDIA_HOLDER_LOOKUP.registerForItems({
286289
stack, _ -> CCMediaHolder.Static({ MediaConstants.QUENCHED_BLOCK_UNIT }, ADMediaHolder.QUENCHED_ALLAY_PRIORITY, stack)
287290
}, HexBlocks.QUENCHED_ALLAY.asItem())
291+
292+
HexCardinalComponents.IOTA_HOLDER_LOOKUP.registerForItems({
293+
stack, _ -> CCItemIotaHolder.Static(stack) {
294+
return@Static DoubleIota(Math.PI)
295+
}
296+
}, Items.PUMPKIN_PIE)
288297
}
289298

290299
private val itemsToAddToCreativeTab : MutableSet<Item> = mutableSetOf()

0 commit comments

Comments
 (0)