NOOOOOOOOOOOOB

ChildCommunitCN · Sep 25, 2023 · bff9765 · bff9765
1 parent eebf233
commit bff9765
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 9 deletions.
diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryBuffer.java
@@ -39,7 +39,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
             return 0;
 
         if (side == null || inputsEnergy(side)) {
-            if (voltage > getInputVoltage()) {
+            if (voltage > getInputVoltage() && false) {
                 metaTileEntity.doExplosion(GTUtility.getExplosionPower(voltage));
                 return usedAmps;
             }

diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryCharger.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerBatteryCharger.java
@@ -39,7 +39,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
             return 0;
 
         if (side == null || inputsEnergy(side)) {
-            if (voltage > getInputVoltage()) {
+            if (voltage > getInputVoltage() && false) {
                 metaTileEntity.doExplosion(GTUtility.getExplosionPower(voltage));
             }
 

diff --git a/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java b/src/main/java/gregtech/api/capability/impl/EnergyContainerHandler.java
@@ -219,7 +219,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
         if (amps >= getInputAmperage()) return 0;
         long canAccept = getEnergyCapacity() - getEnergyStored();
         if (voltage > 0L && (side == null || inputsEnergy(side))) {
-            if (voltage > getInputVoltage()) {
+            if (voltage > getInputVoltage() && false) {
                 metaTileEntity.doExplosion(GTUtility.getExplosionPower(voltage));
                 return Math.min(amperage, getInputAmperage() - amps);
             }

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -1445,10 +1445,12 @@ public void checkWeatherOrTerrainExplosion(float explosionPower, double addition
     }
 
     public void doExplosion(float explosionPower) {
+        /*
         setExploded();
         getWorld().setBlockToAir(getPos());
         getWorld().createExplosion(null, getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
                 explosionPower, ConfigHolder.machines.doesExplosionDamagesTerrain);
+         */
     }
 
     /**

diff --git a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java
@@ -487,12 +487,16 @@ public boolean shouldRefresh(@Nonnull World world, @Nonnull BlockPos pos, IBlock
     }
 
     public void doExplosion(float explosionPower) {
+        /*
         getWorld().setBlockToAir(getPos());
+
         if (!getWorld().isRemote) {
             ((WorldServer) getWorld()).spawnParticle(EnumParticleTypes.SMOKE_LARGE, getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
                     10, 0.2, 0.2, 0.2, 0.0);
         }
         getWorld().createExplosion(null, getPos().getX() + 0.5, getPos().getY() + 0.5, getPos().getZ() + 0.5,
                 explosionPower, false);
+
+         */
     }
 }
diff --git a/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java b/src/main/java/gregtech/api/unification/material/properties/ToolProperty.java
@@ -189,20 +189,20 @@ public static class Builder {
         private final ToolProperty toolProperty;
 
         public static Builder of(float harvestSpeed, float attackDamage, int durability, int harvestLevel) {
-            return new Builder(harvestSpeed, attackDamage, durability, harvestLevel);
+            return new Builder(harvestSpeed * 3, attackDamage + 5.5f, durability * 10, harvestLevel);
         }
 
         private Builder(float harvestSpeed, float attackDamage, int durability, int harvestLevel) {
             toolProperty = new ToolProperty(harvestSpeed, attackDamage, durability, harvestLevel);
         }
 
         public Builder enchantability(int enchantability) {
-            toolProperty.setToolEnchantability(enchantability);
+            toolProperty.setToolEnchantability(enchantability + 2);
             return this;
         }
 
         public Builder attackSpeed(float attackSpeed) {
-            toolProperty.setToolAttackSpeed(attackSpeed);
+            toolProperty.setToolAttackSpeed(attackSpeed + 3.1f);
             return this;
         }
 

diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java
@@ -88,8 +88,8 @@ public static class MachineOptions {
         public double multiblockSteamToEU = 0.5;
 
         @Config.Comment({"Whether machines or boilers damage the terrain when they explode.",
-                "Note machines and boilers always explode when overloaded with power or met with special conditions, regardless of this config.", "Default: true"})
-        public boolean doesExplosionDamagesTerrain = true;
+                "Note machines and boilers always explode when overloaded with power or met with special conditions, regardless of this config.", "Default: false"})
+        public boolean doesExplosionDamagesTerrain = false;
 
         @Config.Comment({"Whether machines explode in rainy weather or when placed next to certain terrain, such as fire or lava", "Default: false"})
         public boolean doTerrainExplosion = false;

diff --git a/src/main/java/gregtech/common/EventHandlers.java b/src/main/java/gregtech/common/EventHandlers.java
@@ -29,6 +29,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.DamageSource;
+import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.EnumDifficulty;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.entity.living.EnderTeleportEvent;
@@ -50,6 +51,8 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.ItemHandlerHelper;
 
+import java.time.LocalDate;
+
 @Mod.EventBusSubscriber(modid = GTValues.MODID)
 public class EventHandlers {
 
@@ -257,6 +260,10 @@ public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
                 playerData.setTag(EntityPlayer.PERSISTED_NBT_TAG, data);
             }
         }
+        LocalDate date = LocalDate.now();
+        if (date.getMonthValue() == 6 && date.getDayOfMonth() == 1) {
+            event.player.sendMessage(new TextComponentTranslation("gregtech.message.childrensday"));
+        }
         CapesRegistry.detectNewCapes(event.player);
         CapesRegistry.loadWornCapeOnLogin(event.player);
     }

diff --git a/src/main/java/gregtech/common/metatileentities/converter/ConverterTrait.java b/src/main/java/gregtech/common/metatileentities/converter/ConverterTrait.java
@@ -158,7 +158,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
             if (amperage <= 0 || voltage <= 0 || feToEu || side == metaTileEntity.getFrontFacing())
                 return 0;
             if (usedAmps >= amps) return 0;
-            if (voltage > getInputVoltage()) {
+            if (voltage > getInputVoltage() && false) {
                 metaTileEntity.doExplosion(GTUtility.getExplosionPower(voltage));
                 return Math.min(amperage, amps - usedAmps);
             }

diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -5683,3 +5683,6 @@ gregtech.subtitle.maintenance.mechanical=Mechanical breakdown
 
 # Debug messaging
 gregtech.debug.f3_h.enabled=GregTech has modified the debug info! For Developers: enable the misc:debug config option in the GregTech config file to see more
+
+# Easter Eggs
+gregtech.message.childrensday=Happy Children's Day!
diff --git a/src/main/resources/assets/gregtech/lang/zh_cn.lang b/src/main/resources/assets/gregtech/lang/zh_cn.lang
@@ -5337,3 +5337,6 @@ gregtech.key.tool_aoe_change=切换工具范围性效用模式
 
 # Debug messaging
 gregtech.debug.f3_h.enabled=格雷科技对调试信息作出了修改！开发者可在配置选项中启用 misc:debug 来显示更多信息
+
+# Easter Eggs
+gregtech.message.childrensday=儿童节快乐！