Skip to content

Commit

Permalink
updated antimatter, removed duplicate recipes, disabled fusion recipe…
Browse files Browse the repository at this point in the history 
…s for now

also removed plasmas
  • Loading branch information
@Trinsdar
Trinsdar committed Jan 24, 2024
1 parent e0d0f02 commit 393a143
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 27 deletions.
2 changes: 1 addition & 1 deletion AntimatterAPI
Submodule AntimatterAPI updated 30 files
+1 −1 TesseractAPI
+4 −0 common/build.gradle
+1 −1 common/gradle.properties
+4 −4 common/src/main/java/muramasa/antimatter/blockentity/BlockEntityCache.java
+1 −1 common/src/main/java/muramasa/antimatter/blockentity/BlockEntityFakeBlock.java
+9 −2 common/src/main/java/muramasa/antimatter/blockentity/BlockEntityMachine.java
+10 −1 common/src/main/java/muramasa/antimatter/capability/CoverHandler.java
+41 −0 common/src/main/java/muramasa/antimatter/capability/machine/MachineCoverHandler.java
+34 −0 common/src/main/java/muramasa/antimatter/capability/pipe/PipeCoverHandler.java
+5 −5 common/src/main/java/muramasa/antimatter/cover/CoverFactory.java
+6 −5 common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterLanguageProvider.java
+8 −0 common/src/main/java/muramasa/antimatter/item/ItemBattery.java
+34 −1 common/src/main/java/muramasa/antimatter/machine/BlockMachine.java
+1 −1 common/src/main/java/muramasa/antimatter/pipe/BlockFluidPipe.java
+5 −5 common/src/main/java/muramasa/antimatter/pipe/BlockItemPipe.java
+56 −8 common/src/main/java/muramasa/antimatter/pipe/BlockPipe.java
+0 −6 common/src/main/java/muramasa/antimatter/tool/IAntimatterTool.java
+1 −6 common/src/main/java/muramasa/antimatter/tool/MaterialSword.java
+1 −7 common/src/main/java/muramasa/antimatter/tool/MaterialTool.java
+60 −3 common/src/main/java/muramasa/antimatter/util/Utils.java
+3 −3 fabric/build.gradle
+1 −1 fabric/gradle.properties
+9 −0 fabric/src/main/java/muramasa/antimatter/mixin/fabric/ItemBatteryMixin.java
+1 −3 fabric/src/main/java/muramasa/antimatter/mixin/fabric/MaterialSwordMixin.java
+1 −3 fabric/src/main/java/muramasa/antimatter/mixin/fabric/MaterialToolMixin.java
+1 −0 fabric/src/main/resources/antimatter-fabric.mixins.json
+1 −1 forge/gradle.properties
+0 −23 forge/src/main/java/muramasa/antimatter/mixin/forge/ItemBatteryMixin.java
+1 −2 forge/src/main/resources/antimatter-forge.mixins.json
+1 −1 gradle.properties
10 changes: 5 additions & 5 deletions common/src/main/java/trinsdar/gt4r/data/GT4RMaterialEvents.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void onMaterialEvent(GT4RMaterialEvent event){
event.setMaterial(Iridium).asMetal(2719, 3000, AntimatterMaterialTypes.PLATE).asOre(3, 7, false).harvestLevel(3);
event.setMaterial(Lead).asMetal(600, 0, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.PLATE_DENSE, AntimatterMaterialTypes.ROD).harvestLevel(2);
event.setMaterial(Manganese).asMetal(1519, 0);
event.setMaterial(Nickel).asMetal(1728, 0, AntimatterMaterialTypes.PLATE).asOre(false).asPlasma();
event.setMaterial(Nickel).asMetal(1728, 0, AntimatterMaterialTypes.PLATE).asOre(false);
event.setMaterial(Osmium).asMetal(3306, 3306, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD);
event.setMaterial(Platinum).asMetal(2041, 0, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD).asOre(3, 7, false).harvestLevel(2);
event.setMaterial(Plutonium).asMetal(912, 0);
Expand All @@ -53,18 +53,18 @@ public static void onMaterialEvent(GT4RMaterialEvent event){
event.setMaterial(Deuterium).asGas();
event.setMaterial(Fluorine).asGas();
event.setMaterial(Hydrogen).asGas(15);
event.setMaterial(Helium).asPlasma();
event.setMaterial(Helium).asGas();
event.setMaterial(Helium3).asGas();
event.setMaterial(Lithium).asMetal(454, 0);
event.setMaterial(Magnesium).asMetal(923, 0);
event.setMaterial(Mercury).asFluid();
event.setMaterial(Nitrogen).asPlasma();
event.setMaterial(Oxygen).asPlasma();
event.setMaterial(Nitrogen).asGas();
event.setMaterial(Oxygen).asGas();
event.setMaterial(Phosphor).asDust(317);
event.setMaterial(Potassium).asMetal(336, 0);
event.setMaterial(Silicon).asMetal(1687, 1000, AntimatterMaterialTypes.PLATE);
event.setMaterial(Sodium).asDust(370);
event.setMaterial(Sulfur).asDust(388).asPlasma();
event.setMaterial(Sulfur).asDust(388);
event.setMaterial(Tin).asMetal(505, 505, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD, AntimatterMaterialTypes.GEAR).asOre(1, 5, false);
event.setMaterial(Tritium).asGas();
event.setMaterial(Zinc).asMetal(692, 0, AntimatterMaterialTypes.PLATE);
Expand Down
13 changes: 0 additions & 13 deletions common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,6 @@ public static void loadRecipes(Consumer<FinishedRecipe> consumer, AntimatterReci
}

}
String[] stones = {"stone", "smooth_stone", "sandstone", "cut_sandstone", "cobblestone", "red_sandstone", "cut_red_sandstone", "prismarine", "dark_prismarine", "polished_granite", "smooth_red_sandstone", "polished_diorite", "mossy_cobblestone", "smooth_sandstone", "smooth_quartz", "granite", "andesite", "polished_andesite", "diorite", "blackstone", "polished_blackstone", "purpur", "quartz", "brick", "stone_brick", "nether_brick", "prismarine_brick", "mossy_stone_brick", "end_stone_brick", "red_nether_brick", "polished_blackstone_brick"};
for (String stone : stones) {
Item full = AntimatterPlatformUtils.getItemFromID(new ResourceLocation(stone + (stone.equals("purpur") || stone.equals("quartz") ? "_block" : stone.contains("brick") ? "s" : "")));
Item slab = AntimatterPlatformUtils.getItemFromID(new ResourceLocation(stone + "_slab"));
String[] pattern = stone.equals("purpur") || stone.equals("quartz") || stone.equals("sandstone") || stone.equals("red_sandstone") || stone.equals("stone_brick") || stone.equals("nether_brick") || stone.equals("polished_blackstone") ? new String[]{"SS"} : new String[]{"S", "S"};
provider.addItemRecipe(consumer, GT4RRef.ID, stone + "_slab_to_" + stone, "slabs", full, of('S', slab), pattern);
}
String[] wood = {"oak", "birch", "spruce", "jungle", "acacia", "dark_oak", "crimson", "warped"};
for (String s : wood) {
ResourceLocation name = new ResourceLocation(s + "_planks");
ResourceLocation slab = new ResourceLocation(s + "_slab");
provider.addItemRecipe(consumer, GT4RRef.ID, slab.getPath() + "_to_" + name.getPath(), "slabs", AntimatterPlatformUtils.getItemFromID(name), of('S', AntimatterPlatformUtils.getItemFromID(slab)), "S", "S");
}
if (AntimatterAPI.isModLoaded(GT4RRef.MOD_TERRESTRIA)){
String[] woodTypes = {"cypress", "hemlock", "japanese_maple", "rainbow_eucalyptus", "redwood", "rubber", "sakura", "willow", "yucca_palm"};
for (String woodType : woodTypes) {
Expand Down
13 changes: 7 additions & 6 deletions common/src/main/java/trinsdar/gt4r/loader/multi/Fusion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,26 @@
import muramasa.antimatter.data.AntimatterMaterials;
import trinsdar.gt4r.data.RecipeMaps;

import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
import static muramasa.antimatter.data.AntimatterMaterials.Gold;
import static muramasa.antimatter.data.AntimatterMaterials.Iron;
import static trinsdar.gt4r.data.Materials.*;

public class Fusion {
public static void init(){
RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium",16, 2048, 60000000);
/*RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium",16, 2048, 60000000);
RecipeMaps.FUSION.RB().fi(Tritium.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium_1",16, 4096, 40000000);
RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Carbon.getLiquid(125)).fo(Oxygen.getPlasma(125)).add("oxygen",32, 4096, 80000000);
RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Silicon.getLiquid(16)).fo(Iron.getPlasma(125)).add("magnesium",32, 8192, 360000000);
RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Silicon.getLiquid(16)).fo(Iron.getLiquid(16)).add("magnesium",32, 8192, 360000000);
RecipeMaps.FUSION.RB().fi(Hydrogen.getGas(16), Manganese.getLiquid(16)).fo(Iron.getLiquid(16)).add("manganese",64, 8192, 120000000);
RecipeMaps.FUSION.RB().fi(Lithium.getLiquid(16), Aluminium.getLiquid(16)).fo(Sulfur.getPlasma(125)).add("sulfur",32, 10240, 240000000);
RecipeMaps.FUSION.RB().fi(Deuterium.getGas(375), Beryllium.getLiquid(16)).fo(Nitrogen.getPlasma(175)).add("nitrogen",16, 16384, 180000000);
RecipeMaps.FUSION.RB().fi(Lithium.getLiquid(16), Aluminium.getLiquid(16)).io(DUST.get(Sulfur)).add("sulfur",32, 10240, 240000000);
RecipeMaps.FUSION.RB().fi(Deuterium.getGas(375), Beryllium.getLiquid(16)).fo(Nitrogen.getGas(175)).add("nitrogen",16, 16384, 180000000);
RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Tungsten.getLiquid(16)).fo(Osmium.getLiquid(16)).add("osmium",64, 24578, 150000000);
RecipeMaps.FUSION.RB().fi(Fluorine.getGas(125), Potassium.getLiquid(16)).fo(Nickel.getPlasma(125)).add("nickel",16, 32768, 480000000);
RecipeMaps.FUSION.RB().fi(Fluorine.getGas(125), Potassium.getLiquid(16)).fo(Nickel.getLiquid(16)).add("nickel",16, 32768, 480000000);
RecipeMaps.FUSION.RB().fi(Tungsten.getLiquid(16), Beryllium.getLiquid(16)).fo(Platinum.getLiquid(16)).add("platinum",32, 32768, 150000000);
RecipeMaps.FUSION.RB().fi(Tungsten.getLiquid(16), Lithium.getLiquid(16)).fo(Iridium.getLiquid(16)).add("iridium",32, 32768, 300000000);
RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Mercury.getLiquid(16)).fo(Uranium238.getLiquid(16)).add("uranium238",64, 49152, 240000000);
RecipeMaps.FUSION.RB().fi(Aluminium.getLiquid(16), Gold.getLiquid(16)).fo(Uranium238.getLiquid(16)).add("uranium238_1",64, 49152, 240000000);
RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Uranium238.getLiquid(16)).fo(Plutonium239.getLiquid(16)).add("plutonium239",128, 49152, 480000000);
RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Uranium238.getLiquid(16)).fo(Plutonium239.getLiquid(16)).add("plutonium239",128, 49152, 480000000);*/
}
}
4 changes: 2 additions & 2 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx5G
org.gradle.daemon=false
org.gradle.parallel=true

mod_version=0.1-alpha-5
mod_version=0.1-alpha-6
archive_base_name=gt4r
modid=gt4r

Expand All @@ -31,7 +31,7 @@ energy_version=2.2.0
top_forge_file=3671753
structurelib_version=2.0.0-pre10
carbon_config_fabric_version=ec9yfAHJ
carbon_config_forge_version=95tti5dP
carbon_config_forge_version=L3ipBBnb

maven_group=com.github.gregtech-intergalactical

Expand Down

0 comments on commit 393a143

Please sign in to comment.