Skip to content

Commit

Permalink
Merge branch '1.18' of https://github.com/MrScautHD/Beyond-Earth into…
Browse files Browse the repository at this point in the history 
… 1.18
  • Loading branch information
@MrScautHD
MrScautHD committed Jan 12, 2022
2 parents 6fe0cf8 + 70964a6 commit d2bafcb
Show file tree
Hide file tree
Showing 80 changed files with 625 additions and 411 deletions.
12 changes: 6 additions & 6 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,20 @@ dependencies {
}

//JEI
compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.41:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.41")
compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.2.68:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.2.68")

//The One Probe
implementation fg.deobf("curse.maven:the-one-probe-245211:3550084")

//Jade
implementation fg.deobf("curse.maven:jade-324717:3551337")

/*
//TConstruct
compile fg.deobf("curse.maven:mantle-74924:3439180")
compile fg.deobf("curse.maven:tinkers-construct-74072:3439200")
//TConstruct
implementation fg.deobf("slimeknights.mantle:Mantle:1.18.1-1.7.26")
implementation fg.deobf("slimeknights.tconstruct:TConstruct:1.18.1-3.3.2.12")

/*
//Mekanism
compile fg.deobf("mekanism:Mekanism:1.16.5-10.0.20.447")
runtimeOnly fg.deobf("mekanism:Mekanism:1.16.5-10.0.20.447:additions")
Expand Down
47 changes: 0 additions & 47 deletions src/main/java/net/mrscauthd/beyond_earth/compat/tinkers/BossToolsSmelteryCompat.java
View file

This file was deleted.

26 changes: 26 additions & 0 deletions src/main/java/net/mrscauthd/beyond_earth/compat/tinkers/TinkersBeyondEarthFluids.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package net.mrscauthd.beyond_earth.compat.tinkers;

import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.ForgeFlowingFluid;
import net.mrscauthd.beyond_earth.BeyondEarthMod;
import slimeknights.mantle.registration.ModelFluidAttributes;
import slimeknights.mantle.registration.deferred.FluidDeferredRegister;
import slimeknights.mantle.registration.object.FluidObject;

public class TinkersBeyondEarthFluids {

protected static final FluidDeferredRegister FLUIDS = new FluidDeferredRegister(BeyondEarthMod.MODID);
public static final FluidObject<ForgeFlowingFluid> MOLTEN_DESH = FLUIDS.register("molten_desh", hotBuilder().temperature(800), Material.LAVA, 12);
public static final FluidObject<ForgeFlowingFluid> MOLTEN_OSTRUM = FLUIDS.register("molten_ostrum", hotBuilder().temperature(800), Material.LAVA, 12);

// /** Creates a builder for a hot fluid

private static FluidAttributes.Builder hotBuilder()
{
return ModelFluidAttributes.builder().density(2000).viscosity(10000).temperature(1000).sound(SoundEvents.BUCKET_FILL_LAVA, SoundEvents.BUCKET_EMPTY_LAVA);
}


}
18 changes: 0 additions & 18 deletions src/main/java/net/mrscauthd/beyond_earth/compat/tinkers/TinkersBossToolsFluids.java
View file

This file was deleted.

6 changes: 4 additions & 2 deletions src/main/java/net/mrscauthd/beyond_earth/compat/tinkers/TinkersCompat.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package net.mrscauthd.beyond_earth.compat.tinkers;

import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.mrscauthd.beyond_earth.compat.CompatibleMod;

public class TinkersCompat extends CompatibleMod {
Expand All @@ -18,8 +20,8 @@ public String getModID() {

@Override
protected void onLoad() {
// IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
// TinkersBossToolsFluids.FLUIDS.register(bus);
IEventBus bus = FMLJavaModLoadingContext.get().getModEventBus();
TinkersBeyondEarthFluids.FLUIDS.register(bus);
}

}
41 changes: 18 additions & 23 deletions src/main/resources/assets/beyond_earth/lang/ko_kr.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,23 @@
"item.beyond_earth.star_crawler_spawn_egg": "Star Crawler 생성 알",
"item.beyond_earth.steel_engine": "강철 엔진",
"item.beyond_earth.oxygen_tank": "산소 탱크",
"item.beyond_earth.steel_hoe": "강철 괭이",
"item.beyond_earth.iron_plate": "철 판",
"item.beyond_earth.desh_plate": "데쉬 판",
"item.beyond_earth.space_station": "우주 정거장",
"item.beyond_earth.compressed_ostrum": "압축 실리콘",
"item.beyond_earth.ice_shard": "얼음 조각",
"item.beyond_earth.compressed_ostrum": "압축 오스트룸",
"item.beyond_earth.netherite_space_pants": "네더라이트 우주복 하의",
"item.beyond_earth.engine_frame": "엔진 프레임",
"item.beyond_earth.ostrum_tank": "실리콘 탱크",
"item.beyond_earth.steel_shovel": "강철 삽",
"item.beyond_earth.ostrum_tank": "오스트룸 탱크",
"item.beyond_earth.desh_engine": "데쉬 엔진",
"item.beyond_earth.hammer": "망치",
"item.beyond_earth.netherite_space_boots": "네더라이트 우주복 부츠",
"item.beyond_earth.steel_pickaxe": "강철 곡괭이",
"item.beyond_earth.space_pants": "우주복 하의",
"item.beyond_earth.rocket_t1": "1 티어 로켓",
"item.beyond_earth.ostrum_engine": "실리콘 엔진",
"item.beyond_earth.ostrum_engine": "오스트룸 엔진",
"item.beyond_earth.space_suit": "우주복 상의",
"item.beyond_earth.alien_zombie_spawn_egg": "외계인 좀비 생성 알",
"item.beyond_earth.netherite_space_suit": "네더라이트 우주복 상의",
"item.beyond_earth.ostrum_ingot": "실리콘 주괴",
"item.beyond_earth.ostrum_ingot": "오스트룸 주괴",
"item.beyond_earth.desh_tank": "데쉬 탱크",
"item.beyond_earth.rocket_nose_cone": "원뿔 탄두",
"item.beyond_earth.compressed_steel": "압축 강철",
Expand All @@ -35,7 +31,6 @@
"item.beyond_earth.iron_stick": "철 막대기",
"item.beyond_earth.oxygen_gear": "산소 장치",
"item.beyond_earth.oxygen_mask": "산소 마스크",
"item.beyond_earth.steel_sword": "강철 검",
"item.beyond_earth.rocket_t2": "2 티어 로켓",
"item.beyond_earth.engine_fan": "엔진 팬",
"item.beyond_earth.rocket_t3": "3 티어 로켓",
Expand All @@ -45,19 +40,18 @@
"item.beyond_earth.rover": "로버",
"item.beyond_earth.alien_spawn_egg": "외계인 생성 알",
"item.beyond_earth.cheese": "치즈",
"item.beyond_earth.steel_axe": "강철 도끼",
"item.beyond_earth.mogler_spawn_egg": "모글러 생성 알",
"item.beyond_earth.martian_raptor_spawn_egg": "Martian Raptor Spawn Egg",
"item.beyond_earth.martian_raptor_spawn_egg": "화성 랩터 생성 알",
"item.beyond_earth.desh_ingot": "데쉬 주괴",
"item.beyond_earth.compressed_desh": "압축 데쉬",
"item.beyond_earth.desh_nugget": "데쉬 조각",
"item.beyond_earth.ostrum_nugget": "실리콘 조각",
"item.beyond_earth.ostrum_nugget": "오스트룸 조각",
"item.beyond_earth.steel_nugget": "강철 조각",
"item.beyond_earth.water_pump": "물 펌프",
"item.beyond_earth.raw_desh": "데쉬 원석",
"item.beyond_earth.raw_ostrum": "실리콘 원석",
"item.beyond_earth.raw_ostrum": "오스트룸 원석",
"item.beyond_earth.raw_desh_block": "데쉬 원석 블록",
"item.beyond_earth.raw_ostrum_block": "실리콘 원석 블록",
"item.beyond_earth.raw_ostrum_block": "오스트룸 원석 블록",
"item.beyond_earth.rocket_t4": "4 티어 로켓",


Expand All @@ -76,7 +70,7 @@
"block.beyond_earth.fuel": "연료",
"block.beyond_earth.oil": "기름",
"block.beyond_earth.rusted_iron_pillar_block": "녹슨 철 기둥",
"block.beyond_earth.mars_ostrum_ore": "화성 실리콘 광석",
"block.beyond_earth.mars_ostrum_ore": "화성 오스트룸 광석",
"block.beyond_earth.moon_brick_slab": "달 벽돌 반 블록",
"block.beyond_earth.cracked_moon_brick_stairs": "금 간 달 벽돌 계단",
"block.beyond_earth.flag_cyan": "청록색 깃발",
Expand Down Expand Up @@ -109,7 +103,6 @@
"block.beyond_earth.venus_diamond_ore": "금성 다이아몬드 광석",
"block.beyond_earth.moon_stone": "달 돌",
"block.beyond_earth.moon_sand": "달 모래",
"block.beyond_earth.mars_ice_shard_ore": "화성 얼음 광석",
"block.beyond_earth.sky_stone": "운석",
"block.beyond_earth.flag_gray": "회색 깃발",
"block.beyond_earth.wall_coal_torch": "석탄 횃불",
Expand All @@ -126,14 +119,14 @@
"block.beyond_earth.moon_iron_ore": "달 철 광석",
"block.beyond_earth.flag_orange": "주황색 깃발",
"block.beyond_earth.steel_block": "강철 블록",
"block.beyond_earth.ostrum_block": "실리콘 블록",
"block.beyond_earth.ostrum_block": "오스트룸 블록",
"block.beyond_earth.venus_coal_ore": "금성 석탄 광석",
"block.beyond_earth.flag_lime": "연두색 깃발",
"block.beyond_earth.moon_cheese_ore": "달 치즈 광석",
"block.beyond_earth.moon_desh_ore": "달 데쉬 광석",
"block.beyond_earth.water_pump": "물 펌프",
"block.beyond_earth.raw_desh_block": "데쉬 원석 블록",
"block.beyond_earth.raw_ostrum_block": "실리콘 원석 블록",
"block.beyond_earth.raw_ostrum_block": "오스트룸 원석 블록",


"fluid.beyond_earth.fuel": "연료",
Expand All @@ -146,7 +139,7 @@
"entity.beyond_earth.alien": "외계인",
"entity.beyond_earth.alien_zombie": "외계인 좀비",
"entity.beyond_earth.star_crawler": "Star Crawler",
"entity.beyond_earth.martian_raptor": "Martian Raptor",
"entity.beyond_earth.martian_raptor": "화성 랩터",
"entity.beyond_earth.rocket_t1": "1 티어 로켓",
"entity.beyond_earth.rocket_t2": "2 티어 로켓",
"entity.beyond_earth.rocket_t3": "3 티어 로켓",
Expand Down Expand Up @@ -199,10 +192,10 @@
"fluid.beyond_earth.molten_desh": "녹은 데쉬",
"fluid.beyond_earth.flowing_molten_desh": "흐르는 녹은 데쉬",
"item.beyond_earth.molten_desh_bucket": "녹은 데쉬 양동이",
"block.beyond_earth.molten_ostrum_fluid": "녹은 실리콘",
"fluid.beyond_earth.molten_ostrum": "녹은 실리콘",
"fluid.beyond_earth.flowing_molten_ostrum": "흐르는 녹은 실리콘",
"item.beyond_earth.molten_ostrum_bucket": "녹은 실리콘 양동이",
"block.beyond_earth.molten_ostrum_fluid": "녹은 오스트룸",
"fluid.beyond_earth.molten_ostrum": "녹은 오스트룸",
"fluid.beyond_earth.flowing_molten_ostrum": "흐르는 녹은 오스트룸",
"item.beyond_earth.molten_ostrum_bucket": "녹은 오스트룸 양동이",

"container.beyond_earth.coal_generator": "석탄 발전기",
"container.beyond_earth.compressor": "압축기",
Expand All @@ -215,6 +208,8 @@
"container.entity.beyond_earth.rocket_t1": "1 티어 로켓",
"container.entity.beyond_earth.rocket_t2": "2 티어 로켓",
"container.entity.beyond_earth.rocket_t3": "3 티어 로켓",
"container.entity.beyond_earth.rocket_t4": "4 티어 로켓",


"tooltip.beyond_earth.oxygen_bubble_distributor": "%1$s ~ %2$s 블록 범위 내 산소 기포 생성",

Expand Down
33 changes: 6 additions & 27 deletions src/main/resources/data/beyond_earth/recipes/desh_block.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,16 @@
"group": "beyond_earth",
"type": "minecraft:crafting_shaped",
"pattern": [
"012",
"345",
"678"
"###",
"#*#",
"###"
],
"key": {
"0": {
"*": {
"item": "beyond_earth:desh_ingot"
},
"1": {
"item": "beyond_earth:desh_ingot"
},
"2": {
"item": "beyond_earth:desh_ingot"
},
"3": {
"item": "beyond_earth:desh_ingot"
},
"4": {
"item": "beyond_earth:desh_ingot"
},
"5": {
"item": "beyond_earth:desh_ingot"
},
"6": {
"item": "beyond_earth:desh_ingot"
},
"7": {
"item": "beyond_earth:desh_ingot"
},
"8": {
"item": "beyond_earth:desh_ingot"
"#": {
"tag": "forge:ingots/desh"
}
},
"result": {
Expand Down
33 changes: 6 additions & 27 deletions src/main/resources/data/beyond_earth/recipes/ostrum_block.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,16 @@
"group": "beyond_earth",
"type": "minecraft:crafting_shaped",
"pattern": [
"012",
"345",
"678"
"###",
"#*#",
"###"
],
"key": {
"0": {
"*": {
"item": "beyond_earth:ostrum_ingot"
},
"1": {
"item": "beyond_earth:ostrum_ingot"
},
"2": {
"item": "beyond_earth:ostrum_ingot"
},
"3": {
"item": "beyond_earth:ostrum_ingot"
},
"4": {
"item": "beyond_earth:ostrum_ingot"
},
"5": {
"item": "beyond_earth:ostrum_ingot"
},
"6": {
"item": "beyond_earth:ostrum_ingot"
},
"7": {
"item": "beyond_earth:ostrum_ingot"
},
"8": {
"item": "beyond_earth:ostrum_ingot"
"#": {
"tag": "forge:ingots/ostrum"
}
},
"result": {
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/data/beyond_earth/recipes/ostrum_ingot_from_nugget.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
"result": {
"item": "beyond_earth:ostrum_ingot"
},
"pattern": [
"###",
"#*#",
"###"
],
"key": {
"*": {
"item": "beyond_earth:ostrum_nugget"
},
"#": {
"tag": "forge:nuggets/ostrum"
}
}
},
"pattern": [
"###",
"#*#",
"###"
]
}
Loading

0 comments on commit d2bafcb

Please sign in to comment.