Merge pull request #1 from Turnip-Labs/bb-7.2

Updated to 7.2

Author: UselessBullets

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'babric-loom' version '1.1.+'
+	id 'babric-loom' version '1.4.+'
 	id 'java'
 }
 
@@ -32,22 +32,6 @@ repositories {
 		}
 		metadataSources { artifact() }
 	}
-	ivy {
-		url = "https://github.com/Turnip-Labs"
-		patternLayout {
-			artifact "[organisation]/releases/download/v[revision]/[module]-[revision].jar"
-			m2compatible = true
-		}
-		metadataSources { artifact() }
-	}
-	ivy {
-		url = "https://github.com/Turnip-Labs"
-		patternLayout {
-			artifact "[organisation]/releases/download/[revision]/[module]-[revision].jar"
-			m2compatible = true
-		}
-		metadataSources { artifact() }
-	}
 	ivy {
 		url = "https://github.com/Turnip-Labs"
 		patternLayout {
@@ -84,8 +68,7 @@ dependencies {
 	// Helper library
 	// If you do not need Halplibe you can comment this line out or delete this line
 	modImplementation "com.github.Turnip-Labs:bta-halplibe:${project.halplibe_version}"
-
-	modImplementation "ModMenu:ModMenu:2.0.3"
+	compileOnly(modRuntimeOnly "com.github.Turnip-Labs:ModMenu:${project.modmenu_version}")
 
 	implementation "org.slf4j:slf4j-api:1.8.0-beta4"
 	implementation "org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0"

gradle.properties

@@ -1,13 +1,14 @@
 org.gradle.jvmargs=-Xmx2G
 
 # BTA
-bta_version=7.1-pre1a
+bta_version=7.2-pre1
 
 # Loader
-loader_version=0.14.19-babric.3-bta
+loader_version=0.15.6-babric.6-bta
 
 # HalpLibe
-halplibe_version=3.2.1
+halplibe_version=4.0.4
+modmenu_version=2.0.6
 
 # Mod
 mod_version=1.0.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/turniplabs/examplemod/BlockCustomShape.java

@@ -0,0 +1,42 @@
+package turniplabs.examplemod;
+
+import net.minecraft.core.block.Block;
+import net.minecraft.core.block.material.Material;
+import net.minecraft.core.util.phys.AABB;
+import net.minecraft.core.world.World;
+import net.minecraft.core.world.WorldSource;
+
+import java.util.ArrayList;
+
+public class BlockCustomShape extends Block {
+	public BlockCustomShape(String key, int id, Material material) {
+		super(key, id, material);
+	}
+	@Override
+	// Determines if the block pushes you out and can suffocate you
+	public boolean isSolidRender() {
+		return false;
+	}
+
+	@Override
+	// Determines if neighboring blocks should cull their sides, among many other things
+	public boolean renderAsNormalBlock() {
+		return false;
+	}
+	@Override
+	public void setBlockBoundsBasedOnState(WorldSource world, int x, int y, int z) {
+		// Resets block bounds
+		this.setBlockBounds(0.0, 0.0, 0.0, 1.0, 1.0, 1.0);
+	}
+	@Override
+	public void getCollidingBoundingBoxes(World world, int x, int y, int z, AABB aabb, ArrayList<AABB> aabbList) {
+		// Adds the collision box for the bottom section of the block
+		setBlockBounds(0, 0, 0, 1, 0.5, 1);
+		super.getCollidingBoundingBoxes(world, x, y, z, aabb, aabbList);
+
+		// Adds the collision box for the top section of the block
+		setBlockBounds(0.25, 0.5, 0.25, 0.75, 1, 0.75);
+		super.getCollidingBoundingBoxes(world, x, y, z, aabb, aabbList);
+		setBlockBounds(0, 0, 0, 1, 1, 1);
+	}
+}

src/main/java/turniplabs/examplemod/CustomBlockModel.java

@@ -0,0 +1,36 @@
+package turniplabs.examplemod;
+
+import net.minecraft.client.render.block.model.BlockModelStandard;
+import net.minecraft.client.render.tessellator.Tessellator;
+import net.minecraft.core.block.Block;
+
+public class CustomBlockModel<T extends Block> extends BlockModelStandard<T> {
+	public CustomBlockModel(Block block) {
+		super(block);
+	}
+	@Override
+	public boolean render(Tessellator tessellator, int x, int y, int z) {
+		boolean flag = false;
+		// Draw the lower cube of the model
+		block.setBlockBounds(0, 0, 0, 1, 0.5, 1);
+		flag |= this.renderStandardBlock(tessellator, this.block, x, y, z);
+
+		// Draw the upper cube of the model
+		block.setBlockBounds(0.25, 0.5, 0.25, 0.75, 1, 0.75);
+		flag |= this.renderStandardBlock(tessellator, this.block, x, y, z);
+
+		this.block.setBlockBoundsBasedOnState(BlockModelStandard.renderBlocks.blockAccess, x, y, z);
+		return flag;
+	}
+
+	@Override
+	public void renderBlockOnInventory(Tessellator tessellator, int metadata, float brightness, float alpha) {
+		// Draw the lower cube of the model
+		block.setBlockBounds(0, 0, 0, 1, 0.5, 1);
+		super.renderBlockOnInventory(tessellator, metadata, brightness, alpha);
+
+		// Draw the upper cube of the model
+		block.setBlockBounds(0.25, 0.5, 0.25, 0.75, 1, 0.75);
+		super.renderBlockOnInventory(tessellator, metadata, brightness, alpha);
+	}
+}

src/main/java/turniplabs/examplemod/CustomItemBlockExample.java

@@ -13,8 +13,11 @@ public CustomItemBlockExample(Block block) {
 	}
 	@Override
 	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int blockX, int blockY, int blockZ, Side side, double xPlaced, double yPlaced) {
+		// Success is true if the block actually placed, otherwise its false
 		boolean success = super.onItemUse(stack, player, world, blockX, blockY, blockZ, side, xPlaced, yPlaced);
-		player.addChatMessage("You " + (success ? "succeeded" : "failed") + " at placing the block");
+
+		// Tell the player they succeeded at placing the block if the did infact place the block
+		player.sendMessage("You " + (success ? "succeeded" : "failed") + " at placing the block");
 		return success;
 	}
 }

src/main/java/turniplabs/examplemod/ExampleMod.java

@@ -1,111 +1,97 @@
 package turniplabs.examplemod;
 
 import net.fabricmc.api.ModInitializer;
-import net.minecraft.client.render.block.model.BlockModelRenderBlocks;
+import net.minecraft.client.render.block.model.BlockModelStandard;
+import net.minecraft.client.render.block.model.BlockModelTorch;
 import net.minecraft.core.block.Block;
 import net.minecraft.core.block.BlockTorch;
 import net.minecraft.core.block.material.Material;
-import net.minecraft.core.item.block.ItemBlock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import turniplabs.halplibe.helper.BlockBuilder;
 import turniplabs.halplibe.util.GameStartEntrypoint;
-import turniplabs.halplibe.util.RecipeEntrypoint;
 
 
 public class ExampleMod implements ModInitializer, GameStartEntrypoint {
 	public static final String MOD_ID = "examplemod";
 	public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
 	public static BlockBuilder standardBlockBuilder = new BlockBuilder(MOD_ID)
-		.setNorthTexture(16, 8) // the coordinates of the blue N texture from the terrain atlas
-		.setSouthTexture(17, 8) // the coordinates of the green S texture from the terrain atlas
-		.setBottomTexture(18, 8) // the coordinates of the purple D texture from the terrain atlas
-		.setEastTexture(16, 9) // the coordinates of the red E texture from the terrain atlas
-		.setWestTexture(17, 9) // the coordinates of the yellow W texture from the terrain atlas
-		.setTopTexture(18, 9) // the coordinates of the orange U texture from the terrain atlas
 		.setHardness(5f); // Sets the hardness which affects the time to mine the blocks
 	public static Block directionCube;
 	public static Block grassTop;
 	public static Block stoneSide;
 	public static Block customBlockItem;
 	public static Block customBlockModel;
+	public static Block customBlockModel2;
 	@Override
 	public void onInitialize() {
 		LOGGER.info("ExampleMod initialized.");
 	}
 
 	@Override
 	public void beforeGameStart() {
-		// Vanilla BTA blocks range from 0 to about 1000,
+		// Vanilla BTA blocks range from 0 to about 1100,
 		// and block ids can only exist within the 0 to 16000 range
 		// you need to make sure to pick ids that aren't being used by the vanilla game
 		// or other mods, a good way to deal with the potential of conflicting ids
 		// is to make your ids user configurable
 		int startingBlockId = 2000;
 
 		// Creates and assigns directionCube a new block with the language key 'tile.examplemod.direction' with an id of 2000
-		directionCube = standardBlockBuilder.build(new Block("direction", startingBlockId++, Material.stone));
+		directionCube = standardBlockBuilder
+			.setBlockModel(block -> new BlockModelStandard<>(block).withTextures(
+				"examplemod:block/up", // Set top texture to up.png
+				"examplemod:block/down", // Set down texture to down.png
+				"examplemod:block/north", // Set north texture to north.png
+				"examplemod:block/east", // Set east texture to east.png
+				"examplemod:block/south", // Set south texture to south.png
+				"examplemod:block/west")) // Set west texture to west.png
+			.build(new Block("direction", startingBlockId++, Material.stone));
 
 		// Creates and assigns grassTop a new block with the language key 'tile.examplemod.grassTop' with an id of 2001 with the top texture changed to grass
-		grassTop = standardBlockBuilder.setTopTexture(8, 1).build(new Block("grassTop", startingBlockId++, Material.grass));
+		grassTop = standardBlockBuilder
+			.setBlockModel(block -> new BlockModelStandard<>(block).withTextures(
+				"minecraft:block/grass_top",
+				"examplemod:block/down",
+				"examplemod:block/north",
+				"examplemod:block/east",
+				"examplemod:block/south",
+				"examplemod:block/west"))
+			.build(new Block("grassTop", startingBlockId++, Material.grass));
 
 		// Creates and assigns stoneSide a new block with the language key 'tile.examplemod.stoneSide' with an id of 2002 with the side textures changed to stone
-		stoneSide = standardBlockBuilder.setSideTextures(0, 1).build(new Block("stoneSide", startingBlockId++, Material.grass));
+		stoneSide = standardBlockBuilder
+			.setBlockModel(block -> new BlockModelStandard<>(block).withTextures(
+			"examplemod:block/up",
+			"examplemod:block/down",
+			"minecraft:block/stone"))
+			.build(new Block("stoneSide", startingBlockId++, Material.grass));
 
 		// Creates and assigns customBlockItem a new block with the language key 'tile.examplemod.customItem' with an id of 2003 with a custom Item class
 		customBlockItem = standardBlockBuilder
-			.setSideTextures(6, 3) // Grass side texture
-			.setTopTexture(8, 1) // Grass Top texture
-			.setBottomTexture(2, 0) // Dirt texture
+			.setBlockModel(block -> new BlockModelStandard<>(block).withTextures(
+				"minecraft:block/grass_top",
+				"minecraft:block/dirt",
+				"minecraft:block/grass_side"))
 			.setItemBlock((Block b) -> new CustomItemBlockExample(b)) // Sets the item version of the block to our custom class
 			.build(new Block("customItem", startingBlockId++, Material.dirt));
 
-		// renderType ids, the vanilla game uses id numbers to specify the model a block should render with
-		// type	| Model
-		// 	0	|	Standard Block
-		//	1	|	Cross block (like flowers and sugarcane)
-		//	2	|	Torch
-		//	3	|	Fire
-		//	4	|	Fluids
-		//	5	|	Redstone wire
-		//	6	|	Crops (like wheat)
-		//	7	|	Door Block
-		//	8	|	Ladder
-		//	9	|	Minecart Rail
-		//	10	|	Stairs
-		//	11	|	Fence
-		//	12	|	Lever
-		//	13	|	Cactus??
-		//	14	|	Block Bed
-		//	15	|	Redstone repeater
-		//	16	|	Piston Base
-		//	17	|	Piston Head
-		//	18	|	Fence Gate
-		//	19	|	Spikes
-		//	20	|	Standard Block again (might do something special but is currently not used by anything)
-		//	21	|	Mossy Stone
-		//	22	|	Legacy Painted Chest model (unused as of 7.1)
-		//	23	|	Flowering Cherry Leaves
-		//	24	|	Algae
-		//	25	|	Candle (For the currently implemented soulwax candle)
-		//	26	|	Firefly lanterns
-		//	27	|	Axis aligned (Used by logs and the marble pillar etc)
-		//	28	|	Basket
-		//	29	|	Pebbles
-		//	30	|	Trapdoors
-		//	31	|	Chainlink Fence
-		//	32	|	Crops Pumpkin
-		//	33	|	Cacao Leaves
-		//	34	|	Flower Jar (rendering is split between the block and the tile entity)
-		//	35	|	Seat
-
 		// Creates and assigns customBlockModel a new block with the language key 'tile.examplemod.customModel' with an id of 2004 with a custom texture and the torch model
 		customBlockModel = new BlockBuilder(MOD_ID)
-			.setTextures("customTorchTexture.png") // Sets the block texture to the one stored in '/assets/examplemod/block/customTorchTexture.png'
-			.setBlockModel(new BlockModelRenderBlocks(2))
-			.setLuminance(14) // Sets the block light output of the block, range from [0 - 15] its converted to a float internally by dividing the value by 15f
+			.setBlockModel(
+				block -> new BlockModelTorch<>(block)
+					.withTextures("examplemod:block/customTorchTexture")) // Sets the block texture to the one stored in '/assets/examplemod/textures/block/customTorchTexture.png'
+			.setLuminance(14) // Sets the block light output of the block, range from [0 - 15] it's converted to a float internally by dividing the value by 15f
 			.build(new BlockTorch("customModel", startingBlockId++));
 
+		// Creates and assigns customBlockModel a new block with the language key 'tile.examplemod.customModel2' with an id of 2006 with a custom texture and the model we created CustomBlockModel
+		customBlockModel2 = new BlockBuilder(MOD_ID)
+			.setBlockModel(
+				block -> new CustomBlockModel<>(block) // Assing our custom model to the block
+					.withTextures("minecraft:block/sponge")) // Sets the block texture to sponge
+			.build(new BlockCustomShape("customModel2", startingBlockId++, Material.sponge)) // Set out custom block that goes with our custom model
+			.withLitInteriorSurface(true); // Makes it sample light from within itself rather than from neighboring blocks
+
 		// Make sure to assign names and descriptions to your blocks in your mods .lang file
 
 		// everytime you set parameters on the blockbuilder it returns a new blockbuilder object, this prevents later modifications to the builder from

src/main/resources/assets/examplemod/block/customTorchTexture.png src/main/resources/assets/examplemod/textures/block/customTorchTexture.png

@@ -30,7 +30,8 @@
   ],
 
   "depends": {
-    "fabricloader": ">=0.13.3"
+    "fabricloader": ">=0.13.3",
+		"halplibe": ">=4.0.4"
   },
   "suggests": {
   }

src/main/resources/assets/examplemod/textures/block/down.png

@@ -8,3 +8,5 @@ tile.examplemod.customItem.name=Custom Item
 tile.examplemod.customItem.desc=Sends a message in chat when to try to place it
 tile.examplemod.customModel.name=Custom Model
 tile.examplemod.customModel.desc=A Torch with custom textures
+tile.examplemod.customModel2.name=Custom Model 2
+tile.examplemod.customModel2.desc=A custom block model with a sponge texture