aaerrmmmm

Author: embinmc

.gitattributes

@@ -1,2 +1,9 @@
-# Auto detect text files and perform LF normalization
-* text=auto
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+

.gitignore

@@ -38,4 +38,3 @@ hs_err_*.log
 replay_*.log
 *.hprof
 *.jfr
-/src/main/generated/.cache

README.md

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -18,18 +18,6 @@ repositories {
 	// for more information about repositories.
 }
 
-loom {
-	splitEnvironmentSourceSets()
-
-	mods {
-		"poosmp" {
-			sourceSet sourceSets.main
-			sourceSet sourceSets.client
-		}
-	}
-
-}
-
 fabricApi {
 	configureDataGeneration()
 }
@@ -42,6 +30,7 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	//modImplementation include("eu.pb4:sgui:1.6.0+1.21")
 
 }
 

build.gradle

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -5,6 +5,9 @@
 import embin.poosmp.items.MobStickItem;
 import embin.poosmp.items.PooSMPItems;
 import embin.poosmp.util.ConvertNamespace;
+import embin.poosmp.util.TradeConstructors;
+import embin.poosmp.villager.PooSMPPoi;
+import embin.poosmp.villager.PooSMPVillagers;
 import net.fabricmc.api.ModInitializer;
 
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
@@ -87,6 +90,7 @@ public static void add_empty(ItemGroup.Entries entries, int amount) { // it dooo
 				entries.add(PooSMPItems.VILLAGER_STICK);
 				entries.add(PooSMPBlocks.SUS);
 				entries.add(PooSMPBlocks.DDEDEDODEDIAMANTE_BLOCK);
+				entries.add(PooSMPItems.COW_STICK);
 			})).build();
 
 		public static final ItemGroup BIOME_STICKS = FabricItemGroup.builder()
@@ -127,6 +131,7 @@ public static void add_empty(ItemGroup.Entries entries, int amount) { // it dooo
 			.icon(() -> new ItemStack(PooSMPItems.ONE_DOLLAR_BILL))
 			.displayName(Text.literal("PooSMP: Money"))
 			.entries((displayContext, entries) -> {
+				entries.add(PooSMPBlocks.BANKERS_TABLE);
 				entries.add(PooSMPItems.ONE_DOLLAR_BILL);
 				entries.add(PooSMPItems.TWO_DOLLAR_BILL);
 				entries.add(PooSMPItems.FIVE_DOLLAR_BILL);
@@ -152,6 +157,9 @@ public void onInitialize() {
 		ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> {
 			entries.addAfter(Items.RED_NETHER_BRICK_WALL, PooSMPBlocks.RED_NETHER_BRICK_FENCE.asItem());
 		});
+		PooSMPPoi.init();
+		PooSMPVillagers.init();
+		TradeConstructors.register_villager_trades();
 		LOGGER.info("im all pooped up");
 	}
 }

pxz/bankers_table.pxz

@@ -0,0 +1,31 @@
+package embin.poosmp.block;
+
+import com.mojang.serialization.MapCodec;
+import net.minecraft.block.*;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.util.math.BlockPos;
+import org.jetbrains.annotations.Nullable;
+
+@Deprecated
+public class ItemShopBlock extends BlockWithEntity implements BlockEntityProvider {
+    public static final MapCodec<ItemShopBlock> CODEC = createCodec(ItemShopBlock::new);
+    protected ItemShopBlock(Settings settings) {
+        super(settings);
+    }
+
+    @Override
+    protected MapCodec<? extends BlockWithEntity> getCodec() {
+        return CODEC;
+    }
+
+    @Nullable
+    @Override
+    public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
+        return null;
+    }
+
+    @Override
+    protected BlockRenderType getRenderType(BlockState state) {
+        return BlockRenderType.MODEL;
+    }
+}