Browse Source

Minor Fixes

parent
commit
b6673f72a9
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 4
- 3
src/main/java/gregapi/GT_API_Proxy.java View File

@@ -882,7 +882,7 @@ public abstract class GT_API_Proxy extends Abstract_Proxy implements IGuiHandler
882 882
 						UT.Entities.sendchat(aEvent.entityPlayer, tChatReturn, F);
883 883
 						if (tDamage > 0) {
884 884
 							ST.use(aEvent.entityPlayer, aStack);
885
-							UT.Sounds.send(SFX.MC_BREAK, aEvent.entityPlayer);
885
+							UT.Sounds.send(aEvent.world, SFX.MC_BREAK, 1.0F, 1.0F, aEvent.x, aEvent.y, aEvent.z);
886 886
 							aEvent.setCanceled(T);
887 887
 						}
888 888
 						return;
@@ -894,7 +894,7 @@ public abstract class GT_API_Proxy extends Abstract_Proxy implements IGuiHandler
894 894
 						UT.Entities.sendchat(aEvent.entityPlayer, tChatReturn, F);
895 895
 						if (tDamage > 0) {
896 896
 							ST.use(aEvent.entityPlayer, aStack);
897
-							UT.Sounds.send(SFX.MC_BREAK, aEvent.entityPlayer);
897
+							UT.Sounds.send(aEvent.world, SFX.MC_BREAK, 1.0F, 1.0F, aEvent.x, aEvent.y, aEvent.z);
898 898
 							aEvent.setCanceled(T);
899 899
 						}
900 900
 						return;
@@ -906,7 +906,7 @@ public abstract class GT_API_Proxy extends Abstract_Proxy implements IGuiHandler
906 906
 						UT.Entities.sendchat(aEvent.entityPlayer, tChatReturn, F);
907 907
 						if (tDamage > 0) {
908 908
 							ST.use(aEvent.entityPlayer, aStack);
909
-							UT.Sounds.send(SFX.MC_BREAK, aEvent.entityPlayer);
909
+							UT.Sounds.send(aEvent.world, SFX.MC_BREAK, 1.0F, 1.0F, aEvent.x, aEvent.y, aEvent.z);
910 910
 							aEvent.setCanceled(T);
911 911
 						}
912 912
 						return;
@@ -943,6 +943,7 @@ public abstract class GT_API_Proxy extends Abstract_Proxy implements IGuiHandler
943 943
 						if (tDamage > 0) {
944 944
 							aStack.damageItem((int)UT.Code.units(tDamage, 10000, 1, T), aEvent.entityPlayer);
945 945
 							if (aStack.getItemDamage() >= aStack.getMaxDamage()) ST.use(aEvent.entityPlayer, aStack);
946
+							UT.Sounds.send(aEvent.world, SFX.MC_IGNITE, 1.0F, 1.0F, aEvent.x, aEvent.y, aEvent.z);
946 947
 							aEvent.setCanceled(T);
947 948
 						}
948 949
 						return;

+ 1
- 1
src/main/java/gregtech/GT_Proxy.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *

+ 1
- 1
src/main/java/gregtech/loaders/b/Loader_MultiTileEntities.java View File

@@ -2087,7 +2087,7 @@ public class Loader_MultiTileEntities implements Runnable {
2087 2087
 		aMat = MT.Greatwood;        aRegistry.add("Greatwood Barrel"                                    , "Fluid Containers"                    , 32017, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       16000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        390, NBT_FLAMMABILITY,       100), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(ANY.Iron));
2088 2088
 		aMat = MT.Silverwood;       aRegistry.add("Silverwood Barrel"                                   , "Fluid Containers"                    , 32018, 32719, MultiTileEntityBarrelWood.class                         ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   5.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, F, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        440                             ), "rGs", "PSP", "PSP", 'G', OD.itemGlue, 'P', OP.plate.dat(aMat), 'S', OP.stickLong.dat(MT.Thaumium));
2089 2089
 		aMat = MT.Plastic;          aRegistry.add("Plastic Can"                                         , "Fluid Containers"                    , 32715, 32719, MultiTileEntityBarrelPlastic.class                      ,                 0, 16, aUtilWood      , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   3.0F, NBT_TANK_CAPACITY,       32000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F, NBT_CAPACITY_HU,        370                             )); IL.PlasticCan.set(aRegistry.getItem(), new OreDictItemData(MT.Plastic, U*6));
2090
-		aMat = MT.StainlessSteel;   aRegistry.add("Drum"                                                , "Fluid Containers"                    , 32716, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2090
+		aMat = MT.StainlessSteel;   aRegistry.add("Stainless Steel Drum"                                , "Fluid Containers"                    , 32716, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2091 2091
 		aMat = MT.Invar;            aRegistry.add("Invar Drum"                                          , "Fluid Containers"                    , 32064, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2092 2092
 		aMat = MT.Desh;             aRegistry.add("Desh Drum"                                           , "Fluid Containers"                    , 32070, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, F                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));
2093 2093
 		aMat = MT.Syrmorite;        aRegistry.add("Syrmorite Drum"                                      , "Fluid Containers"                    , 32020, 32719, MultiTileEntityBarrelMetal.class                        ,                 0, 16, aUtilMetal     , UT.NBT.make(NBT_MATERIAL, aMat, NBT_HARDNESS,   1.0F, NBT_RESISTANCE,   6.0F, NBT_TANK_CAPACITY,       64000L, NBT_PLASMAPROOF, F, NBT_GASPROOF, T, NBT_ACIDPROOF, T                                                          ), " h ", "PSP", "PSP", 'P', OP.plateCurved.dat(aMat), 'S', OP.stickLong.dat(aMat));

Loading…
Cancel
Save