Update to 7.2-pre2!

Author: MartinSVK12

build.gradle

@@ -72,6 +72,14 @@ repositories {
 		}
 		metadataSources { artifact() }
 	}
+	ivy {
+		url = "https://github.com/MartinSVK12"
+		patternLayout {
+			artifact "[organisation]/releases/download/1.6.5/[module]-[revision].jar"
+			m2compatible = true
+		}
+		metadataSources { artifact() }
+	}
 }
 
 dependencies {
@@ -85,9 +93,9 @@ dependencies {
 	// If you do not need Halplibe you can comment this line out or delete this line
 	modImplementation "bta-halplibe:halplibe:${project.halplibe_version}"
 
-	modImplementation "ModMenu:ModMenu:2.0.3"
+	modImplementation "ModMenu:ModMenu:2.0.6"
 
-	modImplementation "catalyst:catalyst-core:1.1.1"
+	modImplementation "catalyst:catalyst-core:1.4.4"
 
 	implementation "org.slf4j:slf4j-api:1.8.0-beta4"
 	implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"

gradle.properties

@@ -1,15 +1,15 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.1-pre1a
+bta_version=7.2-pre2
 
 # Loader
-loader_version=0.14.19-babric.3-bta
+loader_version=0.15.6-babric.6-bta
 
 # HalpLibe
-halplibe_version=3.1.2
+halplibe_version=4.1.3
 
 # Mod
-mod_version=1.0.2
+mod_version=1.0.3
 mod_group=sunsetsatellite
 mod_name=computers

src/main/java/dan200/client/FixedWidthFontRenderer.java

@@ -9,7 +9,7 @@
 import net.minecraft.client.GLAllocation;
 import net.minecraft.client.option.GameSettings;
 import net.minecraft.client.render.RenderEngine;
-import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.tessellator.Tessellator;
 import net.minecraft.core.util.helper.ChatAllowedCharacters;
 import org.lwjgl.opengl.GL11;
 

src/main/java/dan200/shared/BlockComputer.java

@@ -12,18 +12,18 @@
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.block.material.Material;
 import net.minecraft.core.entity.player.EntityPlayer;
+import net.minecraft.core.util.helper.Side;
 import net.minecraft.core.world.World;
 import net.minecraft.core.world.WorldSource;
 import sunsetsatellite.computers.Computers;
 import sunsetsatellite.computers.packets.PacketComputers;
-import turniplabs.halplibe.helper.TextureHelper;
 
 import java.util.Random;
 
 public class BlockComputer extends BlockTileEntityRotatable {
 	private Random random = new Random();
 
-	public int[] blockTextures = new int[]{
+	/*public int[] blockTextures = new int[]{
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/0.png")[0]
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/0.png")[1]),
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/1.png")[0]
@@ -32,8 +32,8 @@ public class BlockComputer extends BlockTileEntityRotatable {
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/2.png")[1]),
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/3.png")[0]
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"computer/3.png")[1]),
-	};
-	public int blinkTexture = 0;
+	};*/
+	//public int blinkTexture = 0;
 
 	public BlockComputer(String id, int i) {
 		super(id, i, Material.stone);
@@ -104,19 +104,20 @@ public int getBlockTextureFromSide(int i) {
 		return this.blockTextures[1];
 	}*/
 
-	public boolean blockActivated(World world, int x, int y, int z, EntityPlayer entityplayer) {
+	@Override
+	public boolean onBlockRightClicked(World world, int x, int y, int z, EntityPlayer player, Side side, double xHit, double yHit) {
 		if (Computers.isMultiplayerClient()) {
 			return true;
 		}
-		if (!entityplayer.isSneaking()) {
+		if (!player.isSneaking()) {
 			TileEntityComputer computer = (TileEntityComputer) world.getBlockTileEntity(x, y, z);
 			if (computer != null) {
 				PacketComputers packet = new PacketComputers();
 				packet.packetType = 1;
 				packet.dataInt = new int[]{x, y, z};
-				Computers.sendToPlayer(entityplayer, packet);
+				Computers.sendToPlayer(player, packet);
 				computer.setSwitchedOn(true);
-				computer.updateClient(entityplayer);
+				computer.updateClient(player);
 			}
 			return true;
 		}

src/main/java/dan200/shared/BlockDiskDrive.java

@@ -12,13 +12,13 @@
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.block.material.Material;
 import net.minecraft.core.entity.player.EntityPlayer;
+import net.minecraft.core.util.helper.Side;
 import net.minecraft.core.world.World;
 import sunsetsatellite.computers.Computers;
-import turniplabs.halplibe.helper.TextureHelper;
 
 public class BlockDiskDrive
 	extends BlockTileEntityRotatable {
-	public int[] blockTextures = new int[]{
+	/*public int[] blockTextures = new int[]{
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/0.png")[0]
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/0.png")[1]),
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/1.png")[0]
@@ -27,7 +27,7 @@ public class BlockDiskDrive
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/2.png")[1]),
 		Block.texCoordToIndex(TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/3.png")[0]
 			,TextureHelper.getOrCreateBlockTexture(Computers.MOD_ID,"diskdrive/3.png")[1]),
-	};
+	};*/
 
 	public BlockDiskDrive(String id, int i) {
 		super(id, i, Material.stone);
@@ -75,14 +75,15 @@ public int getBlockTextureFromSide(int i) {
 		return this.blockTextures[1];
 	}*/
 
-	public boolean blockActivated(World world, int i, int j, int k, EntityPlayer entityplayer) {
+	@Override
+	public boolean onBlockRightClicked(World world, int x, int y, int z, EntityPlayer player, Side side, double xHit, double yHit) {
 		if (Computers.isMultiplayerClient()) {
 			return true;
 		}
-		if (!entityplayer.isSneaking()) {
-			TileEntityDiskDrive drive = (TileEntityDiskDrive) world.getBlockTileEntity(i, j, k);
+		if (!player.isSneaking()) {
+			TileEntityDiskDrive drive = (TileEntityDiskDrive) world.getBlockTileEntity(x, y, z);
 			if (drive != null) {
-				Computers.openDiskDriveGUI(entityplayer, drive);
+				Computers.openDiskDriveGUI(player, drive);
 			}
 			return true;
 		}

src/main/java/dan200/shared/ItemDisk.java

@@ -28,9 +28,8 @@ public class ItemDisk
 	private static Map serverLabelRequests = new HashMap();
 	private static boolean labelsChanged = false;
 
-	public ItemDisk(int i) {
-		super(i);
-		this.setMaxStackSize(1);
+	public ItemDisk(String name, int id) {
+		super(name, id);
 	}
 
 	private static int getNewDiskID(World world) {

src/main/java/dan200/shared/TileEntityComputer.java

@@ -239,7 +239,7 @@ public void playRecord(String record) {
 			}
 			Computers.sendToAllPlayers(packet);
 		} else {
-			this.worldObj.playRecord(record, this.x, this.y, this.z);
+			this.worldObj.playRecord(record, "unknown", this.x, this.y, this.z);
 		}
 	}
 

src/main/java/sunsetsatellite/computers/Computers.java

@@ -7,6 +7,10 @@
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.player.EntityPlayerSP;
+import net.minecraft.client.render.block.model.BlockModelHorizontalRotation;
+import net.minecraft.client.render.block.model.BlockModelRotatable;
+import net.minecraft.client.render.stitcher.AtlasStitcher;
+import net.minecraft.client.render.stitcher.TextureRegistry;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.block.entity.TileEntity;
 import net.minecraft.core.block.tag.BlockTags;
@@ -24,29 +28,34 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sunsetsatellite.computers.packets.PacketComputers;
-import turniplabs.halplibe.helper.BlockBuilder;
-import turniplabs.halplibe.helper.EntityHelper;
-import turniplabs.halplibe.helper.ItemHelper;
+import turniplabs.halplibe.helper.*;
+import turniplabs.halplibe.util.ClientStartEntrypoint;
+import turniplabs.halplibe.util.GameStartEntrypoint;
 import turniplabs.halplibe.util.RecipeEntrypoint;
 import turniplabs.halplibe.util.TomlConfigHandler;
 import turniplabs.halplibe.util.toml.Toml;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.List;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.*;
+import java.nio.file.FileSystem;
+import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
-public class Computers implements ModInitializer, RecipeEntrypoint {
+public class Computers implements ModInitializer, RecipeEntrypoint, ClientStartEntrypoint {
 	public static final String MOD_ID = "computers";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	public static final TomlConfigHandler config;
 	private static int availableBlockId = 1300;
 	private static int availableItemId = 17300;
 
-	public static final RecipeNamespace COMPUTERS = new RecipeNamespace();
-	public static final RecipeGroup<RecipeEntryCrafting<?,?>> WORKBENCH = new RecipeGroup<>(new RecipeSymbol(new ItemStack(Block.workbench)));
+	public static RecipeNamespace COMPUTERS;
+	public static RecipeGroup<RecipeEntryCrafting<?,?>> WORKBENCH;
 
 	static {
 		Toml configToml = new Toml("Computers configuration file.");
@@ -87,20 +96,22 @@ public class Computers implements ModInitializer, RecipeEntrypoint {
 	public static String luaFolder = "/mods/computers/lua";
 
 	public static final BlockComputer computer = (BlockComputer) new BlockBuilder(MOD_ID)
-		.setSideTextures("computer/1.png")
-		.setNorthTexture("computer/2.png")
-		.setTopBottomTexture("computer/3.png")
+		.setSideTextures("computers:block/1_computer")
+		.setNorthTexture("computers:block/2_computer")
+		.setTopBottomTextures("computers:block/3_computer")
 		.setHardness(2)
 		.setResistance(2)
+		.setBlockModel(BlockModelHorizontalRotation::new)
 		.build(new BlockComputer("computer",config.getInt("BlockIDs.computer")).withTags(BlockTags.MINEABLE_BY_PICKAXE));
 	public static final BlockDiskDrive diskDrive = (BlockDiskDrive) new BlockBuilder(MOD_ID)
-		.setSideTextures("diskdrive/1.png")
-		.setNorthTexture("diskdrive/0.png")
-		.setTopBottomTexture("diskdrive/3.png")
+		.setSideTextures("computers:block/1_diskdrive")
+		.setNorthTexture("computers:block/0_diskdrive")
+		.setTopBottomTextures("computers:block/3_diskdrive")
 		.setHardness(2)
 		.setResistance(2)
+		.setBlockModel(BlockModelHorizontalRotation::new)
 		.build(new BlockDiskDrive("diskDrive",config.getInt("BlockIDs.diskDrive")).withTags(BlockTags.MINEABLE_BY_PICKAXE));
-	public static final ItemDisk disk = (ItemDisk) ItemHelper.createItem(MOD_ID,new ItemDisk(config.getInt("ItemIDs.disk")),"computerDisk","floppy.png");
+	public static final ItemDisk disk = new ItemBuilder(MOD_ID).setIcon("computers:item/floppy").build(new ItemDisk("computerDisk",config.getInt("ItemIDs.disk")));
 
 	public static int m_tickCount;
 
@@ -121,8 +132,8 @@ public void onInitialize() {
 		ItemToolPickaxe.miningLevels.put(computer,1);
 		ItemToolPickaxe.miningLevels.put(diskDrive,1);
 
-		EntityHelper.Core.createTileEntity(TileEntityComputer.class,"Computer");
-		EntityHelper.Core.createTileEntity(TileEntityDiskDrive.class,"Disk Drive");
+		EntityHelper.createTileEntity(TileEntityComputer.class,"Computer");
+		EntityHelper.createTileEntity(TileEntityDiskDrive.class,"Disk Drive");
 	}
 
 	public static boolean isMultiplayerClient() {
@@ -199,8 +210,104 @@ public static boolean getCursorBlink() {
 
 	@Override
 	public void onRecipesReady() {
+		RecipeBuilder.Shaped(MOD_ID,"XXX","XYX","XZX")
+			.addInput('X',"minecraft:stones")
+			.addInput('Y',Item.dustRedstone)
+			.addInput('Z',Block.glass)
+			.create("computer",computer.getDefaultStack());
+		RecipeBuilder.Shaped(MOD_ID,"XXX","XYX","XYX")
+			.addInput('X',"minecraft:stones")
+			.addInput('Y',Item.dustRedstone)
+			.create("computer",diskDrive.getDefaultStack());
+		RecipeBuilder.Shaped(MOD_ID,"XXX","XYX","XYX")
+			.addInput('X',Item.paper)
+			.addInput('Y',Item.dustRedstone)
+			.create("computer",disk.getDefaultStack());
+	}
+
+	@Override
+	public void initNamespaces() {
+		COMPUTERS = new RecipeNamespace();
+		WORKBENCH = new RecipeGroup<>(new RecipeSymbol(new ItemStack(Block.workbench)));
 		COMPUTERS.register("workbench",WORKBENCH);
 		Registries.RECIPES.register("computers",COMPUTERS);
-		DataLoader.loadRecipes("/assets/computers/workbench.json");
+	}
+
+	//thanks kill05 ;) (and also why do i have to use this again?)
+	public void loadTextures(AtlasStitcher stitcher){
+		// This is awful, but required until 7.2-pre2 comes ou-- nuh uh, pre2 is here and this is still needed :abyss:
+		String id = TextureRegistry.stitcherMap.entrySet().stream().filter((e)->e.getValue() == stitcher).map(Map.Entry::getKey).collect(Collectors.toSet()).stream().findFirst().orElse(null);
+		if(id == null){
+			throw new RuntimeException("Failed to load textures: invalid atlas provided!");
+		}
+		LOGGER.info("Loading "+id+" textures...");
+		long start = System.currentTimeMillis();
+
+		String path = String.format("%s/%s/%s", "/assets", MOD_ID, stitcher.directoryPath);
+		URI uri;
+		try {
+			uri = DataLoader.class.getResource(path).toURI();
+		} catch (URISyntaxException e) {
+			throw new RuntimeException(e);
+		}
+		FileSystem fileSystem = null;
+		Path myPath;
+		if (uri.getScheme().equals("jar")) {
+			try {
+				fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+			myPath = fileSystem.getPath(path);
+		} else {
+			myPath = Paths.get(uri);
+		}
+
+		Stream<Path> walk;
+		try {
+			walk = Files.walk(myPath, Integer.MAX_VALUE);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		Iterator<Path> it = walk.iterator();
+
+		while (it.hasNext()) {
+			Path file = it.next();
+			String name = file.getFileName().toString();
+			if (name.endsWith(".png")) {
+				String path1 = file.toString().replace(file.getFileSystem().getSeparator(), "/");
+				String cutPath = path1.split(path)[1];
+				cutPath = cutPath.substring(0, cutPath.length() - 4);
+				TextureRegistry.getTexture(MOD_ID + ":"+ id + cutPath);
+			}
+		}
+
+		walk.close();
+		if (fileSystem != null) {
+			try {
+				fileSystem.close();
+			} catch (IOException e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		try {
+			TextureRegistry.initializeAllFiles(MOD_ID, stitcher);
+		} catch (URISyntaxException | IOException e) {
+			throw new RuntimeException("Failed to load textures.", e);
+		}
+		LOGGER.info(String.format("Loaded "+id+" textures (took %sms).", System.currentTimeMillis() - start));
+	}
+
+	@Override
+	public void beforeClientStart() {
+
+	}
+
+	@Override
+	public void afterClientStart() {
+		loadTextures(TextureRegistry.blockAtlas);
+		loadTextures(TextureRegistry.itemAtlas);
+		Minecraft.getMinecraft(Minecraft.class).renderEngine.refreshTextures(new ArrayList<>());
 	}
 }