Browse Source

Fixed something i nthe Crusher

Gregorius Techneticies 2 months ago
parent
commit
28e37d93c1
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 1
- 1
CHANGELOG.md View File

@@ -13,7 +13,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
13 13
 [COMPAT] Aroma1997's Mining Dimension is now Compatible with my Worldgen.
14 14
 [FIXED] Chainsaws used WAY too much durability for Treecapitation!
15 15
 [FIXED] Worldgeneration in different Dimensions had the same RNG as on the Overworld. Now the Seed is being XOR-ed with the Dimension ID to prevent that. This has the convenient Side Effect of the Overworld staying the same as before, because it's ID is Zero.
16
-[CHANGED] Blue Steel is Red Steel now and vice versa. This should fix my ages old fuckup of the Recipes. Everything should still be the same as before when it comes to Stats, just the Color of the Material changed. If you used Matter Fabricators to make Blue Steel for some reason, you may need to check the USB Stick with the Recipe.
16
+[CHANGED] Blue Steel is Red Steel now and vice versa. This should fix my ages old fuckup of the Recipes. Everything should still be the same as before when it comes to Stats, just the Color of the Material changed. If you used Matter Fabricators to make Red/Blue Steel for some reason, you may need to check the USB Stick with the Recipe.
17 17
 [ADDED] Barbecue Sauce (BBQ Sauce), because why not.
18 18
 [ADDED] Axes, Saws and Chainsaws can now place Saplings too. They will still place Workbenches if Saplings cant be placed.
19 19
 [ADDED] Tooltip for Covers that can be controlled with the Cover Controller Cover. In case of Covers where the Cover Controller Cover is required (such as Shutter Cover), it will be Cyan instead of Dark Gray to make it easier to see.

+ 1
- 1
src/main/java/gregapi/data/MT.java View File

@@ -2877,7 +2877,7 @@ public class MT {
2877 2877
 			Midasium                        .addOreByProducts(Au                        );
2878 2878
 			Mithril                         .addOreByProducts(Pt                        );
2879 2879
 			
2880
-// TODO     Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(OREMATS.Chalcopyrite          , 8*U), OM.stack(C                  , 1*U)));
2880
+//          Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(OREMATS.Chalcopyrite          , 8*U), OM.stack(C                  , 1*U)));
2881 2881
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 2, OM.stack(Fe2O3                         , 5*U), OM.stack(C                  , 1*U), OM.stack(CaCO3, 1*U)));
2882 2882
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.Magnetite             ,14*U), OM.stack(C                  , 3*U)));
2883 2883
 			Fe                      .addAlloyingRecipe(new OreDictConfigurationComponent( 6, OM.stack(OREMATS.BasalticMineralSand   ,14*U), OM.stack(C                  , 3*U)));

+ 1
- 1
src/main/java/gregapi/item/multiitem/behaviors/Behavior_Place_Sapling.java View File

@@ -35,7 +35,7 @@ public class Behavior_Place_Sapling extends AbstractBehaviorDefault {
35 35
 	
36 36
 	@Override
37 37
 	public boolean onItemUse(MultiItem aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, byte aSide, float aHitX, float aHitY, float aHitZ) {
38
-		if (aWorld.isRemote || aPlayer == null || !aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack)) return F;
38
+		if (aWorld.isRemote || aPlayer == null || !aPlayer.canPlayerEdit(aX, aY, aZ, aSide, aStack) || SIDES_BOTTOM_HORIZONTAL[aSide]) return F;
39 39
 		
40 40
 		// Scan Inventory for suitable Saplings.
41 41
 		for (int i = 0; i < aPlayer.inventory.mainInventory.length; i++) {

+ 6
- 0
src/main/java/gregapi/recipes/handlers/RecipeMapHandlerCrushing.java View File

@@ -22,6 +22,7 @@ package gregapi.recipes.handlers;
22 22
 import static gregapi.data.CS.*;
23 23
 import static gregapi.data.OP.*;
24 24
 
25
+import gregapi.block.IPrefixBlock;
25 26
 import gregapi.data.CS.BlocksGT;
26 27
 import gregapi.data.IL;
27 28
 import gregapi.data.MT;
@@ -132,6 +133,11 @@ public class RecipeMapHandlerCrushing extends RecipeMapHandler {
132 133
 		return null != aMap.addRecipe(new Recipe(F, F, T, ST.array(ST.amount(1, aInput)), tOutputs, NI, tChances, ZL_FS, ZL_FS, Math.max(1, tDuration), 16, 0));
133 134
 	}
134 135
 	
136
+	@Override
137
+	public boolean containsInput(RecipeMap aMap, ItemStack aStack, OreDictItemData aData) {
138
+		return (aData != null && ST.block(aStack) instanceof IPrefixBlock && aData.mPrefix.contains(TD.Prefix.STANDARD_ORE)) || super.containsInput(aMap, aStack, aData);
139
+	}
140
+	
135 141
 	@Override
136 142
 	public boolean addRecipesProducing(RecipeMap aMap, boolean aNEI, ItemStack aStack, OreDictItemData aData) {
137 143
 		if (BlocksGT.ore != null && aData != null && aData.hasValidPrefixMaterialData() && (aData.mPrefix == OP.crushed || aData.mPrefix == OP.dust || aData.mPrefix == OP.gem)) {

Loading…
Cancel
Save