Skip to content

Commit 1c2c5b6

Browse files
ref: rename TextureStitchEvent to align with other datapack entries
1 parent 8654def commit 1c2c5b6

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/main/java/cam72cam/mod/event/ClientEvents.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22

33
import cam72cam.mod.ModCore;
44
import cam72cam.mod.entity.EntityRegistry;
5-
import cam72cam.mod.event.platform.TextureStitchEvent;
5+
import cam72cam.mod.event.platform.RegisterTextureSpriteEvent;
66
import cam72cam.mod.gui.GuiRegistry;
77
import cam72cam.mod.entity.Player;
8-
import cam72cam.mod.gui.GuiRegistry;
98
import cam72cam.mod.input.Mouse;
109
import cam72cam.mod.math.Vec3d;
1110
import cam72cam.mod.render.BlockRender;
1211
import cam72cam.mod.render.EntityRenderer;
1312
import cam72cam.mod.render.GlobalRender;
1413
import cam72cam.mod.render.opengl.CustomTexture;
15-
import cam72cam.mod.render.opengl.RenderContext;
1614
import cam72cam.mod.render.opengl.VBO;
1715
import cam72cam.mod.world.World;
1816
import net.minecraft.client.Minecraft;
@@ -97,7 +95,7 @@ public MouseGuiEvent(MouseAction action, int x, int y, int button, double scroll
9795
public static final Event<Function<MouseGuiEvent, Boolean>> MOUSE_GUI = new Event<>();
9896
public static final Event<Runnable> MODEL_CREATE = new Event<>();
9997
public static final Event<Consumer<ModelEvent.ModifyBakingResult>> MODEL_BAKE = new Event<>();
100-
public static final Event<Consumer<TextureStitchEvent>> TEXTURE_STITCH = new Event<>();
98+
public static final Event<Consumer<RegisterTextureSpriteEvent>> TEXTURE_STITCH = new Event<>();
10199
public static final Event<Runnable> HACKS = new Event<>();
102100
public static final Event<Runnable> REGISTER_ENTITY = new Event<>();
103101
public static final Event<Consumer<RegisterShadersEvent>> REGISTER_SHADER = new Event<>();
@@ -280,7 +278,7 @@ public static void onColorSetup(RegisterColorHandlersEvent.Block event) {
280278
}
281279

282280
@SubscribeEvent
283-
public static void onTextureStitchEvent(TextureStitchEvent event) {
281+
public static void onTextureStitchEvent(RegisterTextureSpriteEvent event) {
284282
TEXTURE_STITCH.execute(x -> x.accept(event));
285283
}
286284

src/main/java/cam72cam/mod/event/platform/TextureStitchEvent.java renamed to src/main/java/cam72cam/mod/event/platform/RegisterTextureSpriteEvent.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@
1010
import java.util.Optional;
1111

1212
/**
13-
* Our own event to stitch sprite to InventoryMenu.BLOCK_ATLAS
14-
* <p>
15-
* This event is in replacement of net.minecraftforge.client.event.TextureStitchEvent.Pre which was removed
13+
* Fired when texture stitch datapacks are reloaded
1614
*/
17-
public class TextureStitchEvent extends Event implements IModBusEvent {
15+
public class RegisterTextureSpriteEvent extends Event implements IModBusEvent {
1816
private final List<SpriteSource> spriteSources;
1917

20-
public TextureStitchEvent(List<SpriteSource> spriteSources) {
18+
public RegisterTextureSpriteEvent(List<SpriteSource> spriteSources) {
2119
this.spriteSources = spriteSources;
2220
}
2321

22+
/**
23+
* Add custom sprite to <code>InventoryMenu.BLOCK_ATLAS</code>
24+
* @param location Your custom texture
25+
*/
2426
public void addSprite(ResourceLocation location) {
2527
this.addSprite(new SingleFile(location, Optional.empty()));
2628
}

src/main/java/cam72cam/mod/mixin/fix/altas_loader/MixinSpriteResourceLoader.java renamed to src/main/java/cam72cam/mod/mixin/feat/data_registry/MixinSpriteResourceLoader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package cam72cam.mod.mixin.fix.altas_loader;
1+
package cam72cam.mod.mixin.feat.data_registry;
22

3-
import cam72cam.mod.event.platform.TextureStitchEvent;
3+
import cam72cam.mod.event.platform.RegisterTextureSpriteEvent;
44
import com.llamalad7.mixinextras.sugar.Local;
55
import net.minecraft.client.renderer.texture.atlas.SpriteResourceLoader;
66
import net.minecraft.client.renderer.texture.atlas.SpriteSource;
@@ -23,7 +23,7 @@ private static void inject(ResourceManager manager, ResourceLocation p_261709_,
2323
@Local List<SpriteSource> list) {
2424
if(p_261709_.getPath().equals("blocks")) {
2525
//Only hack into main sprite
26-
TextureStitchEvent event = new TextureStitchEvent(list);
26+
RegisterTextureSpriteEvent event = new RegisterTextureSpriteEvent(list);
2727
net.minecraftforge.fml.ModLoader.get().postEvent(event);
2828
}
2929
}

src/main/resources/mixins.feat.universalmodcore.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"large_entity_collision.MixinEntitySectionStorage"
1515
],
1616
"client": [
17+
"data_registry.MixinSpriteResourceLoader",
1718
"global_renderer.MixinRenderGlobal",
1819
"iris_pbr.MixinDeferredWorldRenderingPipeline",
1920
"iris_pbr.MixinNewWorldRenderingPipeline"

src/main/resources/mixins.fix.universalmodcore.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"entity_data_migration.MixinChunkStorage"
1212
],
1313
"client": [
14-
"altas_loader.MixinSpriteResourceLoader",
1514
"block_replacement.MixinBlockStatePredictionHandler",
1615
"direct_draw_call.MixinLevelRenderer",
1716
"screen_navigation.MixinScreen"

0 commit comments

Comments
 (0)