Updated to 7.2-pre2

UselessSolutions · Jun 24, 2024 · 4d672d1 · 4d672d1
1 parent a355f95
commit 4d672d1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,16 +1,16 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.2-pre1
+bta_version=7.2-pre2
 
 # Loader
 loader_version=0.15.6-babric.6-bta
 mod_menu_version=2.0.6
 
 # HalpLibe
-halplibe_version=4.0.5
+halplibe_version=4.1.3
 
 # Mod
-mod_version=1.5.0-7.2-pre1
+mod_version=1.5.0-7.2-pre2
 mod_group=useless
 mod_name=dragonfly
diff --git a/src/main/java/org/useless/dragonfly/debug/block/BlockRotatable.java b/src/main/java/org/useless/dragonfly/debug/block/BlockRotatable.java
@@ -59,7 +59,7 @@ public void onBlockRemoved(World world, int x, int y, int z, int data) {
 		}
 	}
 	@Override
-	public boolean blockActivated(World world, int x, int y, int z, EntityPlayer player) {
+	public boolean onBlockRightClicked(World world, int x, int y, int z, EntityPlayer player, Side side, double xHit, double yHit) {
 		if (world.isClientSide) {
 			return true;
 		}

diff --git a/src/main/java/org/useless/dragonfly/debug/item/ItemDebugStick.java b/src/main/java/org/useless/dragonfly/debug/item/ItemDebugStick.java
@@ -11,7 +11,7 @@ public ItemDebugStick(String name, int id) {
 		super(name,id);
 	}
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int blockX, int blockY, int blockZ, Side side, double xPlaced, double yPlaced) {
+	public boolean onUseItemOnBlock(ItemStack stack, EntityPlayer player, World world, int blockX, int blockY, int blockZ, Side side, double xPlaced, double yPlaced) {
 		int meta = world.getBlockMetadata(blockX, blockY, blockZ);
 		int id = world.getBlockId(blockX, blockY, blockZ);
 		if (player.isSneaking()){

diff --git a/src/main/java/org/useless/dragonfly/model/block/BlockModelDragonFly.java b/src/main/java/org/useless/dragonfly/model/block/BlockModelDragonFly.java
@@ -1,6 +1,7 @@
 package org.useless.dragonfly.model.block;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.render.LightmapHelper;
 import net.minecraft.client.render.block.color.BlockColorDispatcher;
 import net.minecraft.client.render.block.model.BlockModelStandard;
 import net.minecraft.client.render.stitcher.IconCoordinate;
@@ -9,6 +10,7 @@
 import net.minecraft.core.block.Block;
 import net.minecraft.core.util.helper.Side;
 import net.minecraft.core.world.WorldSource;
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL11;
 import org.useless.dragonfly.DragonFly;
 import org.useless.dragonfly.helper.ModelHelper;
@@ -58,7 +60,7 @@ public boolean render(Tessellator tessellator, int x, int y, int z) {
 	}
 
 	@Override
-	public void renderBlockOnInventory(Tessellator tessellator, int metadata, float brightness, float alpha) {
+	public void renderBlockOnInventory(Tessellator tessellator, int metadata, float brightness, float alpha, @Nullable Integer lightmapCoordinate) {
         float xOffset;
 		float yOffset;
 		float zOffset;
@@ -174,6 +176,9 @@ public void renderBlockOnInventory(Tessellator tessellator, int metadata, float
 			for (BlockCube cube: baseModel.blockCubes) {
 				for (BlockFace face: cube.getFaces().values()) {
 					tessellator.setNormal(face.getSide().getOffsetX(), face.getSide().getOffsetY(), face.getSide().getOffsetZ());
+					if (LightmapHelper.isLightmapEnabled() && lightmapCoordinate != null){
+						tessellator.setLightmapCoord(lightmapCoordinate);
+					}
 					float r = 1;
 					float g = 1;
 					float b = 1;