Skip to content

Commit 4544d94

Browse files
committed
Chiselの適正ツール修正
1 parent bad61cb commit 4544d94

4 files changed

Lines changed: 50 additions & 4 deletions

File tree

src/main/java/com/github/gtexpert/core/integration/eio/recipes/EIOMaterialsRecipe.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public static void init() {
181181
// Pulsating Crystal
182182
RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
183183
.input("itemPulsatingPowder")
184-
.fluidInputs(Materials.DrillingFluid.getFluid(50))
184+
.fluidInputs(Materials.DistilledWater.getFluid(50))
185185
.output(ModObject.itemMaterial.getItemNN(), 1, 14)
186186
.duration(600).EUt(24)
187187
.buildAndRegister();
@@ -196,7 +196,7 @@ public static void init() {
196196
// Vibrant Crystal
197197
RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
198198
.input("itemVibrantPowder")
199-
.fluidInputs(Materials.DrillingFluid.getFluid(50))
199+
.fluidInputs(Materials.DistilledWater.getFluid(50))
200200
.output(ModObject.itemMaterial.getItemNN(), 1, 15)
201201
.duration(600).EUt(24)
202202
.buildAndRegister();
@@ -211,7 +211,7 @@ public static void init() {
211211
// Ender Crystal
212212
RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
213213
.input("itemEnderCrystalPowder")
214-
.fluidInputs(Materials.DrillingFluid.getFluid(50))
214+
.fluidInputs(Materials.DistilledWater.getFluid(50))
215215
.output(ModObject.itemMaterial.getItemNN(), 1, 16)
216216
.duration(600).EUt(24)
217217
.buildAndRegister();
@@ -235,7 +235,7 @@ public static void init() {
235235
// Prescient Crystal
236236
RecipeMaps.AUTOCLAVE_RECIPES.recipeBuilder()
237237
.input("itemPrecientPowder")
238-
.fluidInputs(Materials.DrillingFluid.getFluid(50))
238+
.fluidInputs(Materials.DistilledWater.getFluid(50))
239239
.output(ModObject.itemMaterial.getItemNN(), 1, 19)
240240
.duration(600).EUt(24)
241241
.buildAndRegister();

src/main/java/com/github/gtexpert/core/mixins/GTEMixinLoader.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
public class GTEMixinLoader implements ILateMixinLoader {
2020

2121
public static final Map<String, Boolean> modMixinsConfig = new ImmutableMap.Builder<String, Boolean>()
22+
.put(Mods.Names.CHISEL, true)
2223
.put(Mods.Names.DRACONIC_EVOLUTION, true)
2324
.put(Mods.Names.DRACONIC_ADDITIONS, true)
2425
.put(Mods.Names.GREGTECH, true)
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.github.gtexpert.core.mixins.chisel;
2+
3+
import net.minecraft.block.Block;
4+
import net.minecraft.block.material.Material;
5+
import net.minecraft.util.BlockRenderLayer;
6+
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
import team.chisel.api.block.VariationData;
13+
import team.chisel.common.block.BlockCarvable;
14+
15+
@Mixin(value = BlockCarvable.class, remap = false)
16+
public abstract class BlockCarvableMixin extends Block {
17+
18+
protected BlockCarvableMixin(Material materialIn) {
19+
super(materialIn);
20+
}
21+
22+
@Inject(method = "<init>(Lnet/minecraft/block/material/Material;Lnet/minecraft/util/BlockRenderLayer;II[Lteam/chisel/api/block/VariationData;)V",
23+
at = @At("RETURN"))
24+
private void gtexpert$setHarvestLevel(Material material, BlockRenderLayer layer, int index, int max,
25+
VariationData[] variations, CallbackInfo ci) {
26+
if (material == Material.ROCK || material == Material.IRON || material == Material.ANVIL ||
27+
material == Material.ICE || material == Material.PACKED_ICE) {
28+
this.setHarvestLevel("pickaxe", 0);
29+
} else if (material == Material.WOOD) {
30+
this.setHarvestLevel("axe", 0);
31+
} else if (material == Material.GROUND || material == Material.SAND || material == Material.CLAY) {
32+
this.setHarvestLevel("shovel", 0);
33+
}
34+
}
35+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"package": "com.github.gtexpert.core.mixins.chisel",
3+
"refmap": "mixins.gtexpert.refmap.json",
4+
"target": "@env(DEFAULT)",
5+
"minVersion": "0.8",
6+
"compatibilityLevel": "JAVA_8",
7+
"mixins": [
8+
"BlockCarvableMixin"
9+
]
10+
}

0 commit comments

Comments
 (0)