Merge branch 'GregTechCEu:1.20.1' into 1.20.1

Author: code-onigiri

src/generated/resources/assets/gtceu/compass/nodes/tools/mallet.json

@@ -1,7 +1,7 @@
 {
   "button_texture": {
     "type": "item",
-    "res": "gtceu:polybenzimidazole_mallet"
+    "res": "gtceu:silicone_rubber_mallet"
   },
   "items": [
     "#forge:tools/mallets"

src/generated/resources/assets/gtceu/compass/nodes/tools/plunger.json

@@ -1,7 +1,7 @@
 {
   "button_texture": {
     "type": "item",
-    "res": "gtceu:polybenzimidazole_plunger"
+    "res": "gtceu:silicone_rubber_plunger"
   },
   "items": [
     "#forge:tools/plungers"

src/generated/resources/data/gtceu/worldgen/placed_feature/rubber_checked.json

@@ -11,10 +11,7 @@
       ]
     },
     {
-      "type": "minecraft:count",
-      "count": {
-        "type": "gtceu:rubber_tree_chance"
-      }
+      "type": "gtceu:rubber_tree_chance"
     },
     {
       "type": "minecraft:in_square"

src/main/java/com/gregtechceu/gtceu/api/item/component/ElectricStats.java

@@ -158,21 +158,21 @@ private static void addCurrentChargeTooltip(List<Component> tooltip, long curren
         String unit;
         if (durationCurrent.getSeconds() <= 180) {
             currentChargeTime = durationCurrent.getSeconds();
-            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.second");
         } else if (durationCurrent.toMinutes() <= 180) {
             currentChargeTime = durationCurrent.toMinutes();
-            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.minute");
         } else {
             currentChargeTime = durationCurrent.toHours();
-            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.hour");
         }
 
         if (durationMax.getSeconds() <= 180) {
             maxChargeTime = durationMax.getSeconds();
+            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.second");
         } else if (durationMax.toMinutes() <= 180) {
             maxChargeTime = durationMax.toMinutes();
+            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.minute");
         } else {
             maxChargeTime = durationMax.toHours();
+            unit = LocalizationUtils.format("item.gtceu.battery.charge_unit.hour");
         }
 
         if (percentage > 0.5) {

src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java

@@ -96,7 +96,6 @@ public CommonProxy() {
         GTCommandArguments.init(eventBus);
         GTMobEffects.init(eventBus);
         GTParticleTypes.init(eventBus);
-        GTIntProviderTypes.init(eventBus);
         // init common features
         GTRegistries.GLOBAL_LOOT_MODIFIES.register("tool", () -> ToolLootModifier.CODEC);
     }

src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java

@@ -6,6 +6,7 @@
 import com.gregtechceu.gtceu.api.data.worldgen.modifier.FrequencyModifier;
 import com.gregtechceu.gtceu.common.worldgen.feature.FluidSproutFeature;
 import com.gregtechceu.gtceu.common.worldgen.feature.StoneBlobFeature;
+import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement;
 
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
@@ -36,6 +37,7 @@ public static void init() {
         Object inst = FrequencyModifier.FREQUENCY_MODIFIER; // seemingly useless access to init the class in time
         inst = DimensionFilter.DIMENSION_FILTER;
         inst = BiomePlacement.BIOME_PLACEMENT;
+        inst = RubberTreeChancePlacement.RUBBER_TREE_CHANCE_PLACEMENT;
     }
 
     public static void init(IEventBus modEventBus) {

src/main/java/com/gregtechceu/gtceu/common/data/GTIntProviderTypes.java

@@ -3,7 +3,7 @@
 import com.gregtechceu.gtceu.GTCEu;
 import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier;
 import com.gregtechceu.gtceu.api.data.worldgen.modifier.BiomePlacement;
-import com.gregtechceu.gtceu.common.worldgen.RubberTreeChanceWeightedListInt;
+import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
 
 import net.minecraft.core.HolderGetter;
@@ -41,7 +41,7 @@ public static void bootstrap(BootstapContext<PlacedFeature> ctx) {
         PlacementUtils.register(ctx, RUBBER_CHECKED, featureLookup.getOrThrow(GTConfiguredFeatures.RUBBER),
                 new BiomePlacement(List.of(
                         new BiomeWeightModifier(() -> biomeLookup.getOrThrow(CustomTags.IS_SWAMP), 50))),
-                CountPlacement.of(RubberTreeChanceWeightedListInt.INSTANCE),
+                RubberTreeChancePlacement.INSTANCE,
                 InSquarePlacement.spread(),
                 SurfaceWaterDepthFilter.forMaxDepth(0),
                 PlacementUtils.HEIGHTMAP_TOP_SOLID,

src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java

@@ -0,0 +1,34 @@
+package com.gregtechceu.gtceu.common.worldgen.modifier;
+
+import com.gregtechceu.gtceu.GTCEu;
+import com.gregtechceu.gtceu.api.registry.GTRegistries;
+import com.gregtechceu.gtceu.config.ConfigHolder;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.levelgen.placement.PlacementModifierType;
+import net.minecraft.world.level.levelgen.placement.RepeatingPlacement;
+
+import com.mojang.serialization.Codec;
+
+public class RubberTreeChancePlacement extends RepeatingPlacement {
+
+    public static final PlacementModifierType<RubberTreeChancePlacement> RUBBER_TREE_CHANCE_PLACEMENT = GTRegistries
+            .register(
+                    BuiltInRegistries.PLACEMENT_MODIFIER_TYPE, GTCEu.id("rubber_tree_chance"),
+                    () -> RubberTreeChancePlacement.CODEC);
+
+    public static final RubberTreeChancePlacement INSTANCE = new RubberTreeChancePlacement();
+    public static final Codec<RubberTreeChancePlacement> CODEC = Codec.unit(INSTANCE);
+
+    @Override
+    protected int count(RandomSource random, BlockPos pos) {
+        return random.nextFloat() < ConfigHolder.INSTANCE.worldgen.rubberTreeSpawnChance ? 1 : 0;
+    }
+
+    @Override
+    public PlacementModifierType<?> type() {
+        return RUBBER_TREE_CHANCE_PLACEMENT;
+    }
+}