Skip to content
This repository was archived by the owner on Jul 16, 2023. It is now read-only.

Commit f96cced

Browse files
committed
Inital Recipes
1 parent 8193954 commit f96cced

File tree

15 files changed

+80
-30
lines changed

15 files changed

+80
-30
lines changed

build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
apply plugin: 'net.minecraftforge.gradle.forge'
1313

1414

15-
version = "0.1"
15+
version = "0.1.0-alpha"
1616
group = "net.htmlcsjs.htmlTech"
1717
archivesBaseName = "htmlTech"
1818

@@ -47,16 +47,17 @@ repositories {
4747
name "CraftTweaker Maven"
4848
url "https://maven.blamejared.com/"
4949
}
50+
maven {
51+
url "https://cursemaven.com"
52+
}
5053
}
5154

5255
dependencies {
53-
deobfCompile "mezz.jei:jei_1.12.2:+"
54-
//deobfCompile "gregtechce:gregtech:1.12.2:1.17.0.764"
55-
provided(files("libs/gregtech-1.12.2-2.0.0-alpha.jar"))
56-
//deobfCompile "gregicality:gregicality:1.12.2:0.22.7"
56+
deobfCompile("mezz.jei:jei_1.12.2:+")
57+
deobfCompile("curse.maven:gregtechceu-557242:3585578")
5758
deobfCompile("codechicken-lib-1-8:CodeChickenLib-1.12.2:3.2.3.358:universal")
58-
deobfCompile "codechicken:ChickenASM:1.12-1.0.2.9"
59-
deobfCompile "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16"
59+
deobfCompile("codechicken:ChickenASM:1.12-1.0.2.9")
60+
deobfCompile("mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.4.23-16")
6061
deobfCompile("team.chisel.ctm:CTM:MC1.12.2-1.0.2.31")
6162
deobfCompile("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.655")
6263
}
-14.6 MB
Binary file not shown.

src/main/java/net/htmlcsjs/htmlTech/api/capability/LaserContainerHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public long acceptEnergyFromNetwork(EnumFacing side, long voltage, long amperage
188188
long canAccept = getEnergyCapacity() - getEnergyStored();
189189
if (voltage > 0L && (side == null || inputsEnergy(side))) {
190190
if (voltage > getInputVoltage()) {
191-
GTUtility.doOvervoltageExplosion(metaTileEntity, voltage);
191+
metaTileEntity.doExplosion(GTUtility.getExplosionPower(voltage));
192192
return Math.min(amperage, getInputAmperage() - amps);
193193
}
194194
if (canAccept >= voltage) {

src/main/java/net/htmlcsjs/htmlTech/api/materials/HTMaterials.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import static gregtech.api.unification.material.Materials.*;
99
import static gregtech.api.unification.material.info.MaterialFlags.DECOMPOSITION_BY_ELECTROLYZING;
10+
import static gregtech.api.unification.material.info.MaterialFlags.GENERATE_FOIL;
1011
import static gregtech.api.unification.material.info.MaterialIconSet.SHINY;
1112

1213
public class HTMaterials {
@@ -38,17 +39,15 @@ public static void register() {
3839
// Adding Flags to Materials
3940
Diamond.setProperty(LASER, new LaserProperties((int) GTValues.V[5], 128, 2));
4041
Ruby.setProperty(LASER, new LaserProperties((int) GTValues.V[6], 256, 2));
42+
43+
Protactinium.setHidden(false);
44+
Flerovium.setHidden(false);
45+
46+
RhodiumPlatedPalladium.addFlags(GENERATE_FOIL);
4147
}
4248

4349
public static void init() {
44-
//htmlTech.logger.info("Register Htmltech materials");
50+
//HtmlTech.logger.info("Register htmltech materials"); WHY TF DOES THIS CRASH
4551
register();
4652
}
47-
48-
// Properties Builders
49-
/*
50-
public Material.Builder laserProperties(long voltage, int amperage, double efficiency) {
51-
properties.setProperty(LASER, new LaserProperties((int) voltage, amperage, efficiency));
52-
return this;
53-
}*/
5453
}

src/main/java/net/htmlcsjs/htmlTech/common/blocks/BlockHTCasing.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public BlockHTCasing() {
2020
this.setResistance(10.0F);
2121
this.setSoundType(SoundType.METAL);
2222
this.setHarvestLevel("pickaxe", 2);
23-
this.setDefaultState(this.getState(CasingType.FLOPPA_CASING));
23+
this.setDefaultState(this.getState(CasingType.PBI_CASING));
2424
}
2525

2626
@Override
@@ -29,7 +29,7 @@ public boolean canCreatureSpawn(@Nonnull IBlockState state, @Nonnull IBlockAcces
2929
}
3030

3131
public enum CasingType implements IStringSerializable {
32-
FLOPPA_CASING("floppa_casing");
32+
PBI_CASING("pbi_casing");
3333

3434
private final String name;
3535

src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/BlockLaserPipe.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public boolean canPipeConnectToBlock(IPipeTile iPipeTile, EnumFacing enumFacing,
6767
}
6868

6969
@Override
70-
public boolean canPipesConnect(IPipeTile iPipeTile, EnumFacing enumFacing, IPipeTile iPipeTile1) {
71-
return iPipeTile1 instanceof TileEntityLaserPipe && iPipeTile1.getInsulationColor() == iPipeTile.getInsulationColor();
70+
public boolean canPipesConnect(IPipeTile pipeTile, EnumFacing enumFacing, IPipeTile pipeTile1) {
71+
return pipeTile1 instanceof TileEntityLaserPipe && pipeTile1.getPaintingColor() == pipeTile.getPaintingColor();
7272
}
7373

7474
@Override

src/main/java/net/htmlcsjs/htmlTech/common/laserpipe/LaserPipeRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public boolean renderBlock(IBlockAccess world, BlockPos pos, IBlockState state,
119119
}
120120

121121
LaserPipeType fluidPipeType = tileEntityPipe.getPipeType();
122-
int paintingColor = tileEntityPipe.getInsulationColor();
122+
int paintingColor = tileEntityPipe.getPaintingColor();
123123
int connectedSidesMap = blockFluidPipe.getVisualConnections(tileEntityPipe);
124124

125125
if (fluidPipeType != null) {

src/main/java/net/htmlcsjs/htmlTech/common/metatileentity/multiblock/MetaTileEntityLaserCollector.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public MetaTileEntity createMetaTileEntity(MetaTileEntityHolder metaTileEntityHo
103103

104104
@Nullable
105105
protected IBlockState getCasingState() {
106-
return HTMetaBlocks.HT_CASING.getState(BlockHTCasing.CasingType.FLOPPA_CASING);
106+
return HTMetaBlocks.HT_CASING.getState(BlockHTCasing.CasingType.PBI_CASING);
107107
}
108108

109109
@Nonnull
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package net.htmlcsjs.htmlTech.loaders;
2+
3+
import net.htmlcsjs.htmlTech.loaders.recipe.LaserEquipmentLoader;
4+
import net.htmlcsjs.htmlTech.loaders.recipe.MaterialLoader;
5+
6+
public class HTRecipeManiger {
7+
8+
public static void init() {
9+
LaserEquipmentLoader.init();
10+
MaterialLoader.init();
11+
}
12+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package net.htmlcsjs.htmlTech.loaders.recipe;
2+
3+
import gregtech.api.recipes.ingredients.IntCircuitIngredient;
4+
import gregtech.common.blocks.BlockMetalCasing;
5+
import gregtech.common.blocks.MetaBlocks;
6+
import net.htmlcsjs.htmlTech.common.blocks.BlockHTCasing;
7+
8+
import static gregtech.api.GTValues.*;
9+
import static gregtech.api.recipes.RecipeMaps.ASSEMBLER_RECIPES;
10+
import static gregtech.api.unification.material.Materials.*;
11+
import static gregtech.api.unification.ore.OrePrefix.foil;
12+
import static gregtech.api.unification.ore.OrePrefix.wireFine;
13+
import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.HT_CASING;
14+
import static net.htmlcsjs.htmlTech.common.blocks.HTMetaBlocks.LASER_PIPES;
15+
16+
public class LaserEquipmentLoader {
17+
18+
public static void init() {
19+
ASSEMBLER_RECIPES.recipeBuilder()
20+
.input(wireFine, BorosilicateGlass, 8)
21+
.input(foil, Silver, 8)
22+
.input(foil, RhodiumPlatedPalladium, 2)
23+
.fluidInputs(Polybenzimidazole.getFluid(L))
24+
.output(LASER_PIPES[0], 1)
25+
.EUt(VA[IV])
26+
.duration(40)
27+
.buildAndRegister();
28+
29+
ASSEMBLER_RECIPES.recipeBuilder()
30+
.EUt(16)
31+
.inputs(MetaBlocks.METAL_CASING.getItemVariant(BlockMetalCasing.MetalCasingType.ALUMINIUM_FROSTPROOF))
32+
.fluidInputs(Polybenzimidazole.getFluid(L))
33+
.notConsumable(new IntCircuitIngredient(6))
34+
.outputs(HT_CASING.getItemVariant(BlockHTCasing.CasingType.PBI_CASING))
35+
.duration(50)
36+
.buildAndRegister();
37+
38+
}
39+
}

0 commit comments

Comments
 (0)